From 9674adbf4b53e776a8f81cde2491fcb738654801 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Tue, 18 Dec 2018 18:31:09 +0800
Subject: [PATCH] scott: Job [Deploy_DHP_Form_Prod] configuration updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by ·¨¼y°ó
---
 jobs/Deploy_DHP_Form_Prod/config.xml | 38 +++++++++-------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/jobs/Deploy_DHP_Form_Prod/config.xml b/jobs/Deploy_DHP_Form_Prod/config.xml
index cb59afe0..9d7aca39 100644
--- a/jobs/Deploy_DHP_Form_Prod/config.xml
+++ b/jobs/Deploy_DHP_Form_Prod/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.1' encoding='UTF-8'?>
 <maven2-moduleset plugin="maven-plugin@3.2">
   <actions/>
-  <description>打包完會將 war 檔放到 10.36.220.163:/home/ymadmin 下</description>
+  <description>打包完會將 war 檔放到 3.16.159.120 :/home/ymadmin 下</description>
   <keepDependencies>false</keepDependencies>
   <properties>
     <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.11">
@@ -15,7 +15,7 @@
 master
 release/1.15GA
 hotfix/1.15.1GA</description>
-          <defaultValue>master</defaultValue>
+          <defaultValue>feature/I18N</defaultValue>
           <trim>false</trim>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
@@ -46,7 +46,7 @@ hotfix/1.15.1GA</description>
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>Build_Prod_127</assignedNode>
+  <assignedNode>HCC_Proxy</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -78,7 +78,6 @@ hotfix/1.15.1GA</description>
     <jenkins.plugins.slack.SlackNotifier plugin="slack@2.9">
       <baseUrl></baseUrl>
       <teamDomain></teamDomain>
-      <authToken></authToken>
       <tokenCredentialId></tokenCredentialId>
       <botUser>false</botUser>
       <room></room>
@@ -94,7 +93,7 @@ hotfix/1.15.1GA</description>
       <includeTestSummary>false</includeTestSummary>
       <includeFailedTests>false</includeFailedTests>
       <commitInfoChoice>NONE</commitInfoChoice>
-      <includeCustomMessage>false</includeCustomMessage>
+      <includeCustomMessage>true</includeCustomMessage>
       <customMessage></customMessage>
     </jenkins.plugins.slack.SlackNotifier>
   </publishers>
@@ -111,29 +110,16 @@ hotfix/1.15.1GA</description>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.8.10"/>
   </buildWrappers>
   <prebuilders>
-    <hudson.tasks.BatchFile>
-      <command>set path=%path%;&quot;C:\Program Files\Git\usr\bin&quot;;&#xd;
-&#xd;
-SETLOCAL EnableDelayedExpansion&#xd;
-&#xd;
-for /f &quot;skip=1 tokens=1-6 delims= &quot; %%a in (&apos;wmic path Win32_LocalTime Get Day^,Hour^,Minute^,Month^,Second^,Year /Format:table&apos;) do (&#xd;
-    IF NOT &quot;%%~f&quot;==&quot;&quot; (&#xd;
-        set /a FormattedDate=10000 * %%f + 100 * %%d + %%a&#xd;
-        set FormattedDate=%%f!FormattedDate:~-4,2!!FormattedDate:~-2,2!_%%b:%%c&#xd;
-    )&#xd;
-)&#xd;
-for /f &quot;tokens=*&quot; %%i in (&apos;git rev-parse --short HEAD&apos;) do set VAR=%%i_%FormattedDate%&#xd;
-&#xd;
-echo Version:%VAR%&#xd;
-sed -i &quot;s/&lt;title.*/&lt;title&gt;Form v%VAR%&lt;\/title\/&gt;/&quot; src\main\webapp\WEB-INF\jsp\home.jsp&#xd;
-</command>
-    </hudson.tasks.BatchFile>
+    <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;title.*/&lt;title&gt;Form v%VAR%&lt;\/title\/&gt;/&quot; src/main/webapp/WEB-INF/jsp/home.jsp</command>
+    </hudson.tasks.Shell>
   </prebuilders>
   <postbuilders>
-    <hudson.tasks.BatchFile>
-      <command>set path=%path%;&quot;C:\Program Files\Git\usr\bin&quot;;&#xd;
-scp -i F:/jenkins/id_rsa target/designer.war ymadmin@10.36.220.163:~/</command>
-    </hudson.tasks.BatchFile>
+    <hudson.tasks.Shell>
+      <command>scp -i dih target/designer.war ec2-user@3.16.159.120:~/</command>
+    </hudson.tasks.Shell>
   </postbuilders>
   <runPostStepsIfResult>
     <name>SUCCESS</name>
-- 
2.26.2