From c8e465df8c98cf0cb80865971bad566063272bba Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Wed, 15 Jan 2020 15:15:35 +0800
Subject: [PATCH] 20170121: Job [HRB_Mobile_Prod_apk_inhouse] configuration
 updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by §N¨ήS
---
 jobs/HRB_Mobile_Prod_apk_inhouse/config.xml | 22 ++++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml b/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml
index 2ea88e1d..f9fe8368 100644
--- a/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml
+++ b/jobs/HRB_Mobile_Prod_apk_inhouse/config.xml
@@ -4,6 +4,14 @@
   <description>打包 APK 放到 http server 上</description>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <jenkins.model.BuildDiscarderProperty>
+      <strategy class="hudson.tasks.LogRotator">
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>10</numToKeep>
+        <artifactDaysToKeep>-1</artifactDaysToKeep>
+        <artifactNumToKeep>-1</artifactNumToKeep>
+      </strategy>
+    </jenkins.model.BuildDiscarderProperty>
     <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.13">
       <gitLabConnection>ylhealth</gitLabConnection>
     </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
@@ -25,14 +33,6 @@ hotfix/1.14.1GA</description>
         </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
   </properties>
   <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
     <configVersion>2</configVersion>
@@ -60,9 +60,7 @@ hotfix/1.14.1GA</description>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
-      <command>sh jenkins_android_inhouse_prod.sh ${CODE_PUSH}
-
-scp -i ~/jenkins/jenkins -o &quot;ProxyCommand ssh -i ~/jenkins/jenkins -p 8080 jenkins@10.32.86.102 nc %h %p&quot; android/app/build/outputs/apk/release/app-release.apk jenkins@10.36.220.161:/opt/www/hrb/mobileapp/update/${NAME}_${VERSION}.apk</command>
+      <command>sh jenkins_android_inhouse_prod.sh ${CODE_PUSH}</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
@@ -79,9 +77,9 @@ scp -i ~/jenkins/jenkins -o &quot;ProxyCommand ssh -i ~/jenkins/jenkins -p 8080
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.10"/>
     <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.10"/>
   </buildWrappers>
 </project>
\ No newline at end of file
-- 
2.26.2