From 8949b55383561989a49a5ca6807c609e90d976a9 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Tue, 28 May 2019 15:48:35 +0800
Subject: [PATCH] 20170121: 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 §N¨ήS
---
 jobs/CRM_Mobile_SIT_apk/config.xml | 41 ++++++++++++++++++------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/jobs/CRM_Mobile_SIT_apk/config.xml b/jobs/CRM_Mobile_SIT_apk/config.xml
index 7b45a4ad..29141cf1 100644
--- a/jobs/CRM_Mobile_SIT_apk/config.xml
+++ b/jobs/CRM_Mobile_SIT_apk/config.xml
@@ -4,15 +4,7 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>5</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.11">
+    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
       <gitLabConnection>ylhealth</gitLabConnection>
     </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
     <hudson.model.ParametersDefinitionProperty>
@@ -34,8 +26,16 @@ hotfix/1.47.1</description>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>5</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.10.0">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -61,8 +61,17 @@ hotfix/1.47.1</description>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>PATH=&quot;$PATH:/usr/local/bin:/Users/scott/.fastlane/bin/&quot;
-npm install
+      <command>PATH=&quot;$PATH:$HOME/.rvm/bin:/usr/local/bin:/Users/jenkins/.fastlane/bin/&quot;
+
+
+# 加速打包，正式時還是要包
+GYM_INCLUDE_SYMBOLS=false
+GYM_INCLUDE_BITCODE=false
+
+gem install bundler
+bundler install
+
+npm i
 RNFB_ANDROID_PERMISSIONS=true 
 #react-native link
 
@@ -74,8 +83,8 @@ 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 update
+#rvm use 2.6.0
+#bundle update
 bundle exec fastlane android beta
 </command>
     </hudson.tasks.Shell>
@@ -85,7 +94,7 @@ MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
 NAME=CRM_Mobile
 
 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>
+scp -i ~/jenkins/jenkins ~/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>
@@ -114,9 +123,9 @@ scp ~/Sites/${NAME}_${VERSION}.apk 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.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