From bfe32f81a36a01e89ef680d10bf280980ee358f3 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Thu, 13 Jun 2019 23:08:48 +0800
Subject: [PATCH] 20170121: Job [HRB_Mobile_Prod_Expert_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_Prod_Expert_apk/config.xml | 52 +++-------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/jobs/HRB_Mobile_Prod_Expert_apk/config.xml b/jobs/HRB_Mobile_Prod_Expert_apk/config.xml
index d736bd17..beb5c36f 100644
--- a/jobs/HRB_Mobile_Prod_Expert_apk/config.xml
+++ b/jobs/HRB_Mobile_Prod_Expert_apk/config.xml
@@ -12,15 +12,15 @@
         <hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition plugin="global-variable-string-parameter@1.2">
           <name>HRB_Mobile_Prod_Branch</name>
           <description>UAT 使用的版本，如：
-release/1.15GA
-hotfix/1.14.1GA</description>
-          <defaultValue>master</defaultValue>
+Expert/release/1.15GA
+Expert/hotfix/1.14.1GA</description>
+          <defaultValue>Expert/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>
+          <defaultValue>expert</defaultValue>
           <trim>false</trim>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
@@ -51,7 +51,7 @@ hotfix/1.14.1GA</description>
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>Mac_Node</assignedNode>
+  <assignedNode>MAC_BUILD_Machine</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -60,48 +60,8 @@ hotfix/1.14.1GA</description>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>sh jenkins_android_prod.sh ${CODE_PUSH}
-
-#PATH=&quot;$PATH:/usr/local/bin:/Users/jenkins/.fastlane/bin/&quot;
-#export VERSION=$(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 install
-## RNFB_ANDROID_PERMISSIONS=true react-native link
-
-#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;/&apos; src/configs/index.js
-
-#export ANDROID_HOME=/Users/jenkins/Library/Android/sdk
-
-# node node_modules/react-native/local-cli/cli.js bundle --dev false --assets-dest ./android --entry-file index.thread.js --platform android --bundle-output ./android/app/src/main/assets/threads/index.thread.bundle --sourcemap-output ./android/app/src/main/assets/threads/index.thread.map
-#npm run build-thread-android
-
-#bundle exec fastlane android release
-
-#VERSION=Prod_$(date +%Y%m%d)_$(git rev-parse --short HEAD)
-#MODIFIED_DATE=$(git log -1 --format=&quot;%ci&quot; --)
-#NAME=HRB_Mobile
-
-#mv android/app/build/outputs/apk/release/app-release.apk ~/Sites/${NAME}_${VERSION}.apk
-#scp ~/Sites/${NAME}_${VERSION}.apk appuploader@10.57.117.135:~/app/hrb/</command>
+      <command>sh jenkins_android_prod.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_Prod_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>
     <hudson.tasks.Mailer plugin="mailer@1.23">
-- 
2.26.2