From 6bb368afcf507d323ee33d13f66408af1d5e9355 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Tue, 11 Jun 2019 17:05:14 +0800
Subject: [PATCH] 20160017: Job [Deploy_TW_AWS_HRB_oAuth] configuration updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by ÁªþÈ
---
 jobs/Deploy_TW_AWS_HRB_oAuth/config.xml | 27 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml b/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml
index 58fc012c..c492c6ea 100644
--- a/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml
+++ b/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml
@@ -44,6 +44,16 @@
     <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>AWS_HRB_EXPERT_AP</name>
+          <description></description>
+          <defaultValue>13.231.249.208</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>
@@ -75,11 +85,7 @@
   <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>
@@ -159,10 +165,13 @@ sed -i &quot;s/&lt;title.*/&lt;title ng-bind=&apos;page_title&apos;&gt;CRM v${ve
   </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_HRB_PRESALE_AP}
+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