diff --git a/jobs/Deploy_DHP_CHMB_Prod/config.xml b/jobs/Deploy_DHP_CHMB_Prod/config.xml index 4caae831c169afd14acef7915d4bcf5d3b2e19c6..4a017a230e4cd580aad1492e0cd855fa8095ed4d 100644 --- a/jobs/Deploy_DHP_CHMB_Prod/config.xml +++ b/jobs/Deploy_DHP_CHMB_Prod/config.xml @@ -15,7 +15,7 @@ master release/1.15GA hotfix/1.15.1GA - master + feature/I18N false @@ -46,7 +46,7 @@ hotfix/1.15.1GA - Build_Prod_127 + HCC_Proxy false false false @@ -86,7 +86,6 @@ hotfix/1.15.1GA - false @@ -102,7 +101,7 @@ hotfix/1.15.1GA false false NONE - false + true @@ -119,30 +118,18 @@ hotfix/1.15.1GA - - set path=%path%;"C:\Program Files\Git\usr\bin"; - -REM 取得今天的年、月、日 (自動補零) -SETLOCAL EnableDelayedExpansion - -for /f "skip=1 tokens=1-6 delims= " %%a in ('wmic path Win32_LocalTime Get Day^,Hour^,Minute^,Month^,Second^,Year /Format:table') do ( - IF NOT "%%~f"=="" ( - set /a FormattedDate=10000 * %%f + 100 * %%d + %%a - set FormattedDate=%%f!FormattedDate:~-4,2!!FormattedDate:~-2,2!_%%b:%%c - ) -) -for /f "tokens=*" %%i in ('git rev-parse --short HEAD') do set VAR=%%i_%FormattedDate% -for /F "delims=/ tokens=3" %%i in ("%GIT_BRANCH%") do set version=%%i - - -sed -i "s/<base.*/<base href=\"\/CHMB\/\" version=\"%version%_%VAR%\"\/>/" src\main\resources\static\index.html - + + VAR=$(git rev-parse --short HEAD)_$(date +"%Y%m%d_%H%M") +version=${GIT_BRANCH##*/} +sed -i "s/<base.*/<base href=\"\/CHMB\/\" version=\"%version%_%VAR%\"\/>/" src/main/resources/static/index.html + + - - ssh -i F:/jenkins/id_rsa ymadmin@10.36.220.122 "rm -f /opt/chm/CHMB-pack.zip" -scp -i F:/jenkins/id_rsa target/CHMB-pack.zip ymadmin@10.36.220.122:/opt/chm/ - + + ssh -i dih ec2-user@3.16.159.120 "rm -f /opt/chm/CHMB-pack.zip" +scp -i dih target/CHMB-pack.zip ec2-user@3.16.159.120:/opt/chm/ + SUCCESS