From ee16d86734945857bef3a2e4003b451dbb09f6a9 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Tue, 4 Jun 2019 12:01:17 +0800
Subject: [PATCH] 20170121: Job [HRB_Mobile_UAT_apk] configuration updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by §N¨ήS
---
 jobs/HRB_Mobile_UAT_apk/config.xml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/jobs/HRB_Mobile_UAT_apk/config.xml b/jobs/HRB_Mobile_UAT_apk/config.xml
index 73bf2251..e184535d 100644
--- a/jobs/HRB_Mobile_UAT_apk/config.xml
+++ b/jobs/HRB_Mobile_UAT_apk/config.xml
@@ -5,14 +5,6 @@
 </description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>2</daysToKeep>
-        <numToKeep>5</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
     <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
       <gitLabConnection>ylhealth</gitLabConnection>
     </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
@@ -28,6 +20,14 @@ hotfix/1.14.1GA</description>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>2</daysToKeep>
+        <numToKeep>5</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
   </properties>
   <scm class="hudson.plugins.git.GitSCM" plugin="git@3.10.0">
     <configVersion>2</configVersion>
@@ -55,12 +55,7 @@ hotfix/1.14.1GA</description>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>PATH=&quot;$PATH:/usr/local/bin:/Users/jenkins/.fastlane/bin/&quot;
-VERSION=UAT_$(date +%Y%m%d)_$(git rev-parse --short HEAD)
-MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
-
-npm install
-# RNFB_ANDROID_PERMISSIONS=true react-native link
+      <command>sh jenkins_android.sh UAT
 
 sed -i &quot;&quot; &apos;/url/s/http.*\//https:\/\/uat.my.uhealthbank.com\//g&apos; src/configs/index.js
 sed -i &apos;&apos; &quot;/version/s/\&apos;.*\&apos;;/\&apos;${VERSION}\&apos;;/&quot; src/configs/index.js
@@ -78,7 +73,7 @@ MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
 NAME=HRB_Mobile
 
 mv android/app/build/outputs/apk/releaseUAT/app-releaseUAT.apk ~/Sites/${NAME}_${VERSION}.apk
-scp ~/Sites/${NAME}_${VERSION}.apk appuploader@10.57.117.135:~/app/hrb/</command>
+scp -i ~/jenkins/jenkins  ~/Sites/${NAME}_${VERSION}.apk appuploader@10.57.117.135:~/app/hrb/</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -111,9 +106,9 @@ scp ~/Sites/${NAME}_${VERSION}.apk appuploader@10.57.117.135:~/app/hrb/</command
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
     <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
   </buildWrappers>
 </project>
\ No newline at end of file
-- 
2.26.2