From 7f182bc08c96e976289bd1c001458d319565f4e4 Mon Sep 17 00:00:00 2001
From: Hasan Wan <hasan.wan@intel.com>
Date: Tue, 25 Feb 2014 15:58:24 +0200
Subject: [PATCH] Trigger the post-image-creation job in post-build actions
 Clean the workspace before every build

Fixes: #1650

Change-Id: I72ddbd6588d59f095fd251c9aeb72dd8b9aec336
Signed-off-by: Hasan Wan <hasan.wan@intel.com>
---
 jobs/image-creator/config.xml | 47 ++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/jobs/image-creator/config.xml b/jobs/image-creator/config.xml
index ef4bb30..92733f0 100644
--- a/jobs/image-creator/config.xml
+++ b/jobs/image-creator/config.xml
@@ -36,24 +36,23 @@
 
 python ${WORKSPACE}/jenkins-scripts/job_imager.py</command>
     </hudson.tasks.Shell>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.18">      <configs>
-        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
-          <configs class="empty-list"/>
-          <configFactories>
-            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
-              <filePattern>POST-IMAGE-CREATION.env</filePattern>
-              <noFilesFoundAction>SKIP</noFilesFoundAction>
-            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
-          </configFactories>
+  </builders>
+  <publishers>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.18">
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameters>
+              <propertiesFile>POST-IMAGE-CREATION.env</propertiesFile>
+              <failTriggerOnMissing>true</failTriggerOnMissing>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameters>
+          </configs>
           <projects>post-image-creation</projects>
           <condition>ALWAYS</condition>
           <triggerWithNoParameters>false</triggerWithNoParameters>
-          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
-        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
       </configs>
-    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
-  </builders>
-  <publishers>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
     <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@1.8">
       <groovyScript>def name = manager.getLogMatcher(&apos;.*&quot;name&quot;: &quot;(.*)&quot;.*&apos;)
 def build = manager.getLogMatcher(&apos;.*&quot;buildid&quot;: &quot;(.*)&quot;.*&apos;)
@@ -63,24 +62,12 @@ if(name?.matches() &amp;&amp; build?.matches()) {
     </groovyScript>
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
-    <hudson.plugins.ws__cleanup.WsCleanup plugin="ws-cleanup@0.16">
-      <patterns>
-        <hudson.plugins.ws__cleanup.Pattern>
-          <pattern></pattern>
-          <type>INCLUDE</type>
-        </hudson.plugins.ws__cleanup.Pattern>
-      </patterns>
-      <deleteDirs>true</deleteDirs>
-      <skipWhenFailed>false</skipWhenFailed>
-      <cleanWhenSuccess>true</cleanWhenSuccess>
-      <cleanWhenUnstable>true</cleanWhenUnstable>      <cleanWhenFailure>true</cleanWhenFailure>
-      <cleanWhenNotBuilt>true</cleanWhenNotBuilt>
-      <cleanWhenAborted>true</cleanWhenAborted>
-      <notFailBuild>false</notFailBuild>
-      <cleanupMatrixParent>false</cleanupMatrixParent>
-    </hudson.plugins.ws__cleanup.WsCleanup>
   </publishers>
   <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.16">
+      <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
     <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4">
       <includes>configuration, jenkins-scripts/job_imager.py, jenkins-scripts/common/*</includes>
       <excludes></excludes>
-- 
2.7.4