Updated pre-release-create job configuration

Updated from pre-production testing. Inluded ws-cleanup changes,
priority sorter and plugin version updates.

Change-Id: I64928f4b64421429651d33f30fd04f10d75683b3
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>

diff --git a/jobs/pre-release-create/config.xml b/jobs/pre-release-create/config.xml
index c14a470..8c34adb 100644 (file)
--- a/jobs/pre-release-create/config.xml
+++ b/jobs/pre-release-create/config.xml
@@ -9,11 +9,7 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
+  <properties/>
   <scm class="hudson.scm.NullSCM"/>
   <quietPeriod>0</quietPeriod>
   <assignedNode>download</assignedNode>
@@ -31,7 +27,7 @@ python jenkins-scripts/job_pre_release_obs.py create_images
 
 </command>
     </hudson.tasks.Shell>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.18">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.17">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs class="empty-list"/>
@@ -60,13 +56,20 @@ if(matcher?.matches()) {
 }</groovyScript>
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
-    <hudson.plugins.ws__cleanup.WsCleanup plugin="ws-cleanup@0.10">
+    <hudson.plugins.ws__cleanup.WsCleanup plugin="ws-cleanup@0.16">
       <deleteDirs>false</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.10">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.16">
       <deleteDirs>false</deleteDirs>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
     <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4">
@@ -77,7 +80,7 @@ if(matcher?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.64">
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>