From 850ae5daac07944c453f185488746ad732fbc200 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Mon, 29 Apr 2019 09:25:50 +0800
Subject: [PATCH] 20160017: Job [Deploy_HRB_oAuth_PRESALE_AWS] configuration
 updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by ÁªþÈ
---
 jobs/Deploy_HRB_oAuth_PRESALE_AWS/config.xml | 46 +++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/jobs/Deploy_HRB_oAuth_PRESALE_AWS/config.xml b/jobs/Deploy_HRB_oAuth_PRESALE_AWS/config.xml
index 2a3235b2..6d18977c 100644
--- a/jobs/Deploy_HRB_oAuth_PRESALE_AWS/config.xml
+++ b/jobs/Deploy_HRB_oAuth_PRESALE_AWS/config.xml
@@ -7,6 +7,26 @@
     <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
       <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>如
+master
+release/1.15GA
+hotfix/1.15.1GA
+feature/HEALTHERA-77</description>
+          <defaultValue>expert_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>AWS_PRESALE_HRB_oAuth</name>
+          <description></description>
+          <defaultValue>13.115.232.200</defaultValue>
+          <trim>false</trim>
+        </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>1</daysToKeep>
@@ -33,16 +53,12 @@
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>PRESALEt_172.16.40.163</assignedNode>
+  <assignedNode>AWS_BUILD_Machine</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers>
-    <hudson.triggers.TimerTrigger>
-      <spec>0 7,13,17 * * *</spec>
-    </hudson.triggers.TimerTrigger>
-  </triggers>
+  <triggers/>
   <concurrentBuild>false</concurrentBuild>
   <rootModule>
     <groupId>org.ylhealth.ym.hrb.oauth</groupId>
@@ -52,7 +68,7 @@
   <defaultGoals>spring-boot:run</defaultGoals>
   <aggregatorStyleBuild>true</aggregatorStyleBuild>
   <incrementalBuild>false</incrementalBuild>
-  <ignoreUpstremChanges>false</ignoreUpstremChanges>
+  <ignoreUpstremChanges>true</ignoreUpstremChanges>
   <ignoreUnsuccessfulUpstreams>false</ignoreUnsuccessfulUpstreams>
   <archivingDisabled>true</archivingDisabled>
   <siteArchivingDisabled>false</siteArchivingDisabled>
@@ -109,22 +125,28 @@
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <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>
   <prebuilders>
     <hudson.tasks.Shell>
       <command>VAR=$(git rev-parse --short HEAD)_$(date +&quot;%Y%m%d_%H%M&quot;)
 version=$(echo $GIT_BRANCH | cut -d&apos;/&apos; -f 3)
-sed -i &quot;s/&lt;title.*/&lt;title ng-bind=&apos;page_title&apos;&gt;CRM v${version}_${VAR}&lt;\/title\/&gt;/&quot; src/main/resources/static/index.html
+sed -i &quot;s/&lt;title.*/&lt;title ng-bind=&apos;page_title&apos;&gt;HRB_oAuth v${version}_${VAR}&lt;\/title\/&gt;/&quot; src/main/resources/static/index.html
 </command>
     </hudson.tasks.Shell>
   </prebuilders>
   <postbuilders>
     <hudson.tasks.Shell>
-      <command>systemctl stop HRBoAuth
-rm -f /opt/HRB_oAuth/lib/*.jar
-/usr/bin/unzip -j -o target/authservice-pack.zip &quot;authservice/lib/*&quot; -d /opt/HRB_oAuth/lib
-systemctl start HRBoAuth</command>
+      <command>PROD_FILE=authservice-pack.zip
+KEY_FILE=../../jenkins
+TARGET_HOST=jenkins@${AWS_PRESALE_HRB_oAuth}
+SSH_PROXY=&quot;ProxyCommand ssh -i ${KEY_FILE} proxy@10.57.117.130 nc %h %p&quot;
+
+ssh -i ${KEY_FILE} -o &quot;${SSH_PROXY}&quot; ${TARGET_HOST} &quot;rm -f ${PROD_FILE}&quot;
+scp -i ${KEY_FILE} -o &quot;${SSH_PROXY}&quot; target/${PROD_FILE} ${TARGET_HOST}:~/</command>
     </hudson.tasks.Shell>
   </postbuilders>
   <runPostStepsIfResult>
-- 
2.26.2