From fe902b3e2d99ae4311cb48e98d3d741d68556fd2 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Mon, 24 Dec 2018 12:22:33 +0800
Subject: [PATCH] scott: Job [Deploy_TW_AWS_CHMB_Prod] configuration updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by ·¨¼y°ó
---
 jobs/Deploy_TW_AWS_CHMB_Prod/config.xml | 28 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/jobs/Deploy_TW_AWS_CHMB_Prod/config.xml b/jobs/Deploy_TW_AWS_CHMB_Prod/config.xml
index c0078648..45604852 100644
--- a/jobs/Deploy_TW_AWS_CHMB_Prod/config.xml
+++ b/jobs/Deploy_TW_AWS_CHMB_Prod/config.xml
@@ -18,6 +18,12 @@ hotfix/1.15.1GA</description>
           <defaultValue>feature/I18N</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_TW_CRM_AP</name>
+          <description></description>
+          <defaultValue>13.231.136.128</defaultValue>
+          <trim>false</trim>
+        </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
     <jenkins.model.BuildDiscarderProperty>
@@ -46,7 +52,7 @@ hotfix/1.15.1GA</description>
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>HCC_Proxy</assignedNode>
+  <assignedNode>AWS_BUILD_Machine</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -83,8 +89,7 @@ hotfix/1.15.1GA</description>
     </hudson.maven.reporters.MavenMailer>
   </reporters>
   <publishers>
-    <jenkins.plugins.slack.SlackNotifier plugin="slack@2.9">
-      <baseUrl></baseUrl>
+    <jenkins.plugins.slack.SlackNotifier plugin="slack@2.12">
       <teamDomain></teamDomain>
       <tokenCredentialId></tokenCredentialId>
       <botUser>false</botUser>
@@ -103,6 +108,11 @@ hotfix/1.15.1GA</description>
       <commitInfoChoice>NONE</commitInfoChoice>
       <includeCustomMessage>true</includeCustomMessage>
       <customMessage></customMessage>
+      <customMessageSuccess></customMessageSuccess>
+      <customMessageAborted></customMessageAborted>
+      <customMessageNotBuilt></customMessageNotBuilt>
+      <customMessageUnstable></customMessageUnstable>
+      <customMessageFailure></customMessageFailure>
     </jenkins.plugins.slack.SlackNotifier>
   </publishers>
   <buildWrappers>
@@ -121,14 +131,20 @@ hotfix/1.15.1GA</description>
     <hudson.tasks.Shell>
       <command>VAR=$(git rev-parse --short HEAD)_$(date +&quot;%Y%m%d_%H%M&quot;)
 version=${GIT_BRANCH##*/}
-sed -i &quot;s/&lt;base.*/&lt;base href=\&quot;\/CHMB\/\&quot; version=\&quot;${version}_${VAR}\&quot;\/&gt;/&quot; src/main/resources/static/index.html
+sed -i &quot;&quot; &quot;s/&lt;base.*/&lt;base href=\&quot;\/CHMB\/\&quot; version=\&quot;${version}_${VAR}\&quot;\/&gt;/&quot; src/main/resources/static/index.html
 </command>
     </hudson.tasks.Shell>
   </prebuilders>
   <postbuilders>
     <hudson.tasks.Shell>
-      <command>ssh -i /root/.ssh/id_rsa ec2-user@13.231.136.128 &quot;rm -f CHMB-pack.zip&quot;
-scp -i /root/.ssh/id_rsa target/CHMB-pack.zip ec2-user@13.231.136.128:~/</command>
+      <command>PROD_FILE=CHMB-pack.zip
+KEY_FILE=../../jenkins
+TARGET_HOST=jenkins@${AWS_CHM_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