From 7db5d11a086f400e04d266acdedbeb31771a62c4 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Mon, 25 Nov 2019 08:34:58 +0800
Subject: [PATCH] 20180083: Job [Hi365_Backend_Commit_Build] configuration
 updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by §õº~?
---
 jobs/Hi365_Backend_Commit_Build/config.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/jobs/Hi365_Backend_Commit_Build/config.xml b/jobs/Hi365_Backend_Commit_Build/config.xml
index 025f4f1e..8e8d8f5b 100644
--- a/jobs/Hi365_Backend_Commit_Build/config.xml
+++ b/jobs/Hi365_Backend_Commit_Build/config.xml
@@ -4,6 +4,9 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.13">
+      <gitLabConnection>ylhealth</gitLabConnection>
+    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>1</daysToKeep>
@@ -12,9 +15,6 @@
         <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>
   </properties>
   <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
     <configVersion>2</configVersion>
@@ -46,7 +46,7 @@
       <triggerOnPipelineEvent>false</triggerOnPipelineEvent>
       <triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
       <triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
-      <triggerOnApprovedMergeRequest>true</triggerOnApprovedMergeRequest>
+      <triggerOnApprovedMergeRequest>false</triggerOnApprovedMergeRequest>
       <triggerOpenMergeRequestOnPush>never</triggerOpenMergeRequestOnPush>
       <triggerOnNoteRequest>true</triggerOnNoteRequest>
       <noteRegex>Jenkins please retry a build</noteRegex>
@@ -58,7 +58,7 @@
       <excludeBranchesSpec></excludeBranchesSpec>
       <sourceBranchRegex></sourceBranchRegex>
       <targetBranchRegex></targetBranchRegex>
-      <secretToken>{AQAAABAAAAAQ0c5o1z0MGtZUQyP3j8gGQAeBKcdip8qcBnleIMrd8HA=}</secretToken>
+      <secretToken>{AQAAABAAAAAQ4R0RCgWukPJKwHvnXf3xNLKzESro75OhfnPrIdqoUfs=}</secretToken>
       <pendingBuildName></pendingBuildName>
       <cancelPendingBuildsOnUpdate>false</cancelPendingBuildsOnUpdate>
     </com.dabsquared.gitlabjenkins.GitLabPushTrigger>
@@ -90,5 +90,6 @@ ng build</command>
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.10"/>
   </buildWrappers>
 </project>
\ No newline at end of file
-- 
2.26.2