From dea7f3a46b4ecf626d174564b564d266469c6098 Mon Sep 17 00:00:00 2001
From: Hyokeun Jeon <hyokeun.jeon@samsung.com>
Date: Wed, 15 Jan 2020 15:27:09 +0900
Subject: [PATCH] Add retry routine

Change-Id: Ic70eafdf396529756579ab593e17a159cc6256e1
(cherry picked from commit 0e7b0c584653db3e1509a1e5a8f1de2fd9d58d70)
---
 jobs/pre-release-image-creator/config.xml | 54 +++++++++++--------------------
 1 file changed, 18 insertions(+), 36 deletions(-)

diff --git a/jobs/pre-release-image-creator/config.xml b/jobs/pre-release-image-creator/config.xml
index 066cea5..0c27479 100644
--- a/jobs/pre-release-image-creator/config.xml
+++ b/jobs/pre-release-image-creator/config.xml
@@ -1,4 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <project>
   <actions/>
   <description>Image creation jobs for all kinds of images</description>
@@ -10,7 +10,7 @@
       <scanQueueFor>ALL</scanQueueFor>
       <blockingJobs>create-snapshot</blockingJobs>
     </hudson.plugins.buildblocker.BuildBlockerProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.28">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -28,13 +28,17 @@
           <name>TRIGGER_INFO</name>
           <description></description>
           <defaultValue></defaultValue>
-          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MIC_APPLIANCE_RETRY_COUNT</name>
+          <description></description>
+          <defaultValue>0</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>imager</assignedNode>
+  <assignedNode>pre-release-imager</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -49,14 +53,13 @@ python ${WORKSPACE}/jenkins-scripts/job_imager.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.35.2">
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.32">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.FileBuildParameters>
               <propertiesFile>POST-IMAGE-CREATION.env</propertiesFile>
               <failTriggerOnMissing>true</failTriggerOnMissing>
-              <textParamValueOnNewLine>false</textParamValueOnNewLine>
               <useMatrixChild>false</useMatrixChild>
               <onlyExactRuns>false</onlyExactRuns>
             </hudson.plugins.parameterizedtrigger.FileBuildParameters>
@@ -64,14 +67,12 @@ python ${WORKSPACE}/jenkins-scripts/job_imager.py</command>
           <projects>post-image-creation</projects>
           <condition>ALWAYS</condition>
           <triggerWithNoParameters>false</triggerWithNoParameters>
-          <triggerFromChildProjects>false</triggerFromChildProjects>
         </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.FileBuildParameters>
               <propertiesFile>BUILD-MONITOR.env</propertiesFile>
               <failTriggerOnMissing>false</failTriggerOnMissing>
-              <textParamValueOnNewLine>false</textParamValueOnNewLine>
               <useMatrixChild>false</useMatrixChild>
               <onlyExactRuns>false</onlyExactRuns>
             </hudson.plugins.parameterizedtrigger.FileBuildParameters>
@@ -79,49 +80,34 @@ python ${WORKSPACE}/jenkins-scripts/job_imager.py</command>
           <projects>BUILD-MONITOR</projects>
           <condition>ALWAYS</condition>
           <triggerWithNoParameters>false</triggerWithNoParameters>
-          <triggerFromChildProjects>false</triggerFromChildProjects>
         </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.FileBuildParameters>
-              <propertiesFile>BUILD-MONITOR-TIMEOUT.env</propertiesFile>
+              <propertiesFile>image_creator_retry.env</propertiesFile>
               <failTriggerOnMissing>true</failTriggerOnMissing>
-              <textParamValueOnNewLine>false</textParamValueOnNewLine>
               <useMatrixChild>false</useMatrixChild>
               <onlyExactRuns>false</onlyExactRuns>
             </hudson.plugins.parameterizedtrigger.FileBuildParameters>
           </configs>
-          <projects>BUILD-MONITOR</projects>
-          <condition>ALWAYS</condition>
+          <projects>pre-release-image-creator</projects>
+          <condition>FAILED</condition>
           <triggerWithNoParameters>false</triggerWithNoParameters>
-          <triggerFromChildProjects>false</triggerFromChildProjects>
         </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
       </configs>
     </hudson.plugins.parameterizedtrigger.BuildTrigger>
-    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@2.4">
-      <script plugin="script-security@1.43">
-        <script>def name = manager.getLogMatcher(&apos;.*&quot;name&quot;: &quot;(.*)&quot;.*&apos;)
-def build = manager.getLogMatcher(&apos;.*&quot;buildid&quot;: &quot;(.*)&quot;.*&apos;)
-if(name?.matches() &amp;&amp; build?.matches()) {
-    manager.addShortText(build.group(1)+&apos;:&apos;+name.group(1))
-}
-    </script>
-        <sandbox>false</sandbox>
-      </script>
-      <behavior>0</behavior>
-      <runForMatrixParent>false</runForMatrixParent>
-    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.34">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.30">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@1.19">
+    <hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@1.17.1">
       <strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
-        <timeoutMinutes>55</timeoutMinutes>
+        <timeoutMinutes>100</timeoutMinutes>
       </strategy>
+      <timeoutEnvVar>JOB_TIMEOUT_IN_MILLISECONDS</timeoutEnvVar>
       <operationList>
         <hudson.plugins.build__timeout.operations.FailOperation/>
       </operationList>
@@ -135,15 +121,11 @@ if(name?.matches() &amp;&amp; build?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@2.1.5">
+    <EnvInjectBuildWrapper plugin="envinject@1.93.1">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
-        <secureGroovyScript plugin="script-security@1.43">
-          <script></script>
-          <sandbox>false</sandbox>
-        </secureGroovyScript>
         <loadFilesFromMaster>false</loadFilesFromMaster>
       </info>
     </EnvInjectBuildWrapper>
   </buildWrappers>
-</project>
\ No newline at end of file
+</project>
-- 
2.7.4