From 73c023348c3659e14813cc11f89ff1551ffad14d Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Mon, 28 Jan 2019 09:53:42 +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 | 31 ++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/jobs/CRM_Mobile_SIT_apk/config.xml b/jobs/CRM_Mobile_SIT_apk/config.xml
index 6ad30096..2a0626a0 100644
--- a/jobs/CRM_Mobile_SIT_apk/config.xml
+++ b/jobs/CRM_Mobile_SIT_apk/config.xml
@@ -4,9 +4,6 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.11">
-      <gitLabConnection>ylhealth</gitLabConnection>
-    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
@@ -15,6 +12,28 @@
         <artifactNumToKeep>-1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
+    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.11">
+      <gitLabConnection>ylhealth</gitLabConnection>
+    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition plugin="global-variable-string-parameter@1.2">
+          <name>GIT_BRANCH</name>
+          <description>develop
+feature/I18N
+release/1.47
+hotfix/1.47.1</description>
+          <defaultValue>develop</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>API_SERVER</name>
+          <description>Server連線位置</description>
+          <defaultValue>10.32.86.124</defaultValue>
+          <trim>false</trim>
+        </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
   </properties>
   <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
     <configVersion>2</configVersion>
@@ -26,7 +45,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>*/develop</name>
+        <name>*/${GIT_BRANCH}</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -49,7 +68,7 @@ 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; --)
 
-sed -i &apos;&apos; &quot;/url/s/\&apos;.*\&apos;;/\&apos;http:\/\/10.32.86.132\/CRM\/\&apos;;/&quot; app/configs/constant/urls.js
+sed -i &apos;&apos; &quot;/url/s/\&apos;.*\&apos;;/\&apos;http:\/\/${API_SERVER}\/CRM\/\&apos;;/&quot; app/configs/constant/urls.js
 sed -i &apos;&apos; &quot;/version/s/\&apos;.*\&apos;;/\&apos;${VERSION}\&apos;;/&quot; app/configs/constant/urls.js
 sed -i &apos;&apos; &quot;/modifiedTime/s/\&apos;.*\&apos;;/\&apos;${MODIFIED_DATE}\&apos;;/&quot; app/configs/constant/urls.js
 
@@ -92,9 +111,9 @@ 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">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.10"/>
   </buildWrappers>
 </project>
\ No newline at end of file
-- 
2.26.2