From 5869487041f036db3d31b65dadf6b34d64856dca Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Thu, 11 Apr 2019 08:39:25 +0800
Subject: [PATCH] scott: Job [CRM_Mobile_SIT_apk] configuration updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by ·¨¼y°ó
---
 jobs/CRM_Mobile_SIT_apk/config.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/jobs/CRM_Mobile_SIT_apk/config.xml b/jobs/CRM_Mobile_SIT_apk/config.xml
index 2a0626a0..900e9f5c 100644
--- a/jobs/CRM_Mobile_SIT_apk/config.xml
+++ b/jobs/CRM_Mobile_SIT_apk/config.xml
@@ -35,7 +35,7 @@ hotfix/1.47.1</description>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -52,7 +52,7 @@ hotfix/1.47.1</description>
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>Mac_Node</assignedNode>
+  <assignedNode>MAC_BUILD_Machine</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -63,7 +63,8 @@ hotfix/1.47.1</description>
     <hudson.tasks.Shell>
       <command>PATH=&quot;$PATH:/usr/local/bin:/Users/scott/.fastlane/bin/&quot;
 npm install
-RNFB_ANDROID_PERMISSIONS=true react-native link
+RNFB_ANDROID_PERMISSIONS=true 
+#react-native link
 
 VERSION=SIT_$(date +%Y%m%d%H)_$(git rev-parse --short HEAD)
 MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
@@ -73,6 +74,7 @@ sed -i &apos;&apos; &quot;/version/s/\&apos;.*\&apos;;/\&apos;${VERSION}\&apos;;
 sed -i &apos;&apos; &quot;/modifiedTime/s/\&apos;.*\&apos;;/\&apos;${MODIFIED_DATE}\&apos;;/&quot; app/configs/constant/urls.js
 
 export ANDROID_HOME=~/Library/Android/sdk
+rvm use 2.6.0
 bundle exec fastlane android beta
 </command>
     </hudson.tasks.Shell>
@@ -81,8 +83,8 @@ bundle exec fastlane android beta
 MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
 NAME=CRM_Mobile
 
-mv android/app/build/outputs/apk/app-releaseStaging.apk ~/Sites/${NAME}_${VERSION}.apk
-scp ~/Sites/${NAME}_${VERSION}.* appuploader@10.57.117.135:~/app/crm/</command>
+mv android/app/build/outputs/apk/releaseStaging/app-releaseStaging.apk ~/Sites/${NAME}_${VERSION}.apk
+scp ~/Sites/${NAME}_${VERSION}.apk appuploader@10.57.117.135:~/app/crm/</command>
     </hudson.tasks.Shell>
     <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.35.2">
       <configs>
@@ -111,8 +113,8 @@ scp ~/Sites/${NAME}_${VERSION}.* appuploader@10.57.117.135:~/app/crm/</command>
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.10"/>
-    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.1">
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
   </buildWrappers>
-- 
2.26.2