From b23e36cfcecfe7d0fb5af5ef4ad8be0e737d0653 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Fri, 10 Jan 2020 10:28:54 +0800
Subject: [PATCH] 20170121: Job [HRB_Mobile_Prod_apk_inhouse] 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_Prod_apk_inhouse/config.xml | 37 +++++++--------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml b/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml
index 8586484e..4f22ee70 100644
--- a/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml
+++ b/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml
@@ -4,7 +4,7 @@
   <description>打包 APK 放到 http server 上</description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
+    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.13">
       <gitLabConnection>ylhealth</gitLabConnection>
     </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
     <hudson.model.ParametersDefinitionProperty>
@@ -17,6 +17,12 @@ hotfix/1.14.1GA</description>
           <defaultValue>master</defaultValue>
           <trim>false</trim>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
+        <hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition plugin="global-variable-string-parameter@1.2">
+          <name>CODE_PUSH</name>
+          <description>哪一個 Job 執行 code-push</description>
+          <defaultValue>hrb</defaultValue>
+          <trim>false</trim>
+        </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <jenkins.model.BuildDiscarderProperty>
@@ -28,7 +34,7 @@ hotfix/1.14.1GA</description>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
   </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.10.0">
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
     <configVersion>2</configVersion>
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
@@ -54,37 +60,18 @@ hotfix/1.14.1GA</description>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>PATH=&quot;$HOME/.rvm/bin:/usr/local/bin:$PATH:/Users/jenkins/.fastlane/bin/&quot;
-export VERSION=Prod_$(grep appVersion appConfig.json|cut -d&apos;&quot;&apos; -f4)_$(git rev-parse --short HEAD)
-MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
-
-npm run reset-android
-
-sed -i &quot;&quot; &apos;/url/s/http.*\//https:\/\/hrb.foxconn.com\//g&apos; src/configs/index.js
-sed -i &apos;&apos; &quot;/version/s/\&apos;.*\&apos;;/\&apos;${VERSION}\&apos;;/&quot; src/configs/index.js
-sed -i &apos;&apos; &quot;/modifiedTime/s/\&apos;.*\&apos;;/\&apos;${MODIFIED_DATE}\&apos;;/&quot; src/configs/index.js
-sed -i &apos;&apos; &apos;s/piwikSiteId_ios =.*/piwikSiteId_ios = 10;/ ;s/piwikSiteId_android =.*/piwikSiteId_android = 11;/; s/installSourceId_android =.*/installSourceId_android = &apos;\&apos;&apos;HonHai&apos;\&apos;&apos;;/&apos; src/configs/index.js
-
-npm run build-thread-android
-bundle exec fastlane android gradleRelease</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>VERSION=Prod_$(date +%Y%m%d)_$(git rev-parse --short HEAD)
-MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
-NAME=HRB_Mobile
-
-scp -o ProxyCommand=&apos;ssh -p 8080 jenkins@10.32.86.102 nc %h %p&apos; android/app/build/outputs/apk/release/app-release.apk jenkins@10.36.220.161:/opt/www/hrb/mobileapp/update/${NAME}_${VERSION}.apk</command>
+      <command>sh jenkins_android_inhouse_prod.sh ${CODE_PUSH}</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
-    <hudson.tasks.Mailer plugin="mailer@1.23">
+    <hudson.tasks.Mailer plugin="mailer@1.29">
       <recipients>$RD_Group $QA_Group</recipients>
       <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
       <sendToIndividuals>false</sendToIndividuals>
     </hudson.tasks.Mailer>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.37">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.38">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
@@ -93,6 +80,6 @@ scp -o ProxyCommand=&apos;ssh -p 8080 jenkins@10.32.86.102 nc %h %p&apos; androi
     <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.10"/>
   </buildWrappers>
 </project>
\ No newline at end of file
-- 
2.26.2