From 19140aacbb0412d375f74e933dc87b12ec3932c3 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Wed, 12 Jun 2019 09:56:11 +0800
Subject: [PATCH] 20170121: Job [HRB_Mobile_Other_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_Other_apk/config.xml | 45 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/jobs/HRB_Mobile_Other_apk/config.xml b/jobs/HRB_Mobile_Other_apk/config.xml
index 08159d3a..e4bfea0a 100644
--- a/jobs/HRB_Mobile_Other_apk/config.xml
+++ b/jobs/HRB_Mobile_Other_apk/config.xml
@@ -11,7 +11,7 @@
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
         <hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition plugin="global-variable-string-parameter@1.2">
-          <name>HRB_Mobile_Other_Branch</name>
+          <name>GIT_BRANCH</name>
           <description>feature branch使用的版本，如：
 feature/HA-818
 其他Branch請自行設定
@@ -39,6 +39,12 @@ commitId
           <defaultValue>http</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>other</defaultValue>
+          <trim>false</trim>
+        </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <jenkins.model.BuildDiscarderProperty>
@@ -60,7 +66,7 @@ commitId
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>*/${HRB_Mobile_Other_Branch}</name>
+        <name>*/${GIT_BRANCH}</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -76,27 +82,22 @@ commitId
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>sh jenkins_android.sh SIT_${DownloadName}
-
-sed -i &apos;&apos; &quot;/url/s/http.*\//${HTT_PROTOCOL}:\/\/${API_SERVER}\//g&quot; 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; &quot;/allergyUrl/s/\__DEV__.*\&apos;;/\&apos;${HTT_PROTOCOL}:\/\/${API_SERVER}\/\&apos;;/&quot; src/configs/index.js
-sed -i &apos;&apos; &apos;s/appVersion.*/appVersion&quot;: &quot;1.27&quot;/&apos; appConfig.json
-
-export ANDROID_HOME=/Users/jenkins/Library/Android/sdk
-
-npm run build-thread-android
-bundle exec fastlane android beta</command>
-    </hudson.tasks.Shell>
-    <hudson.tasks.Shell>
-      <command>VERSION=SIT_${DownloadName}_$(date +%Y%m%d)
-MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
-NAME=HRB_Mobile
-
-mv android/app/build/outputs/apk/releaseStaging/app-releaseStaging.apk ~/Sites/${NAME}_${VERSION}.apk
-scp -i ~/jenkins/jenkins ~/Sites/${NAME}_${VERSION}.apk appuploader@10.57.117.135:~/app/hrb/</command>
+      <command>sh jenkins_android_sit.sh ${CODE_PUSH}</command>
     </hudson.tasks.Shell>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.35.2">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
+          </configs>
+          <projects>HRB_Mobile_SIT_apk_CodePush</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <triggerFromChildProjects>false</triggerFromChildProjects>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
   </builders>
   <publishers/>
   <buildWrappers>
-- 
2.26.2