From 5a6e6be58e5fecb3916fc055dd481321ab2c6204 Mon Sep 17 00:00:00 2001
From: Ed Bartosh <eduard.bartosh@intel.com>
Date: Mon, 22 Jul 2013 21:37:42 +0300
Subject: [PATCH] Updated image-creator and requests job configs

Included changes in priority plugin and changes caused by plugin version
upgrades.

Change-Id: I2537453546e99567e37fb1d86c2fc68a0a0c42e6
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
---
 jobs/image-creator/config.xml |  8 ++------
 jobs/requests/config.xml      | 13 +++++--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/jobs/image-creator/config.xml b/jobs/image-creator/config.xml
index f1ff3fb..6d24e2f 100644
--- a/jobs/image-creator/config.xml
+++ b/jobs/image-creator/config.xml
@@ -3,11 +3,7 @@
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
+  <properties/>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>imager</assignedNode>
   <canRoam>false</canRoam>
@@ -50,7 +46,7 @@ python jenkins-scripts/job_imager.py</command>
       <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>
diff --git a/jobs/requests/config.xml b/jobs/requests/config.xml
index 891dfed..816ef39 100644
--- a/jobs/requests/config.xml
+++ b/jobs/requests/config.xml
@@ -3,11 +3,7 @@
   <actions/>
   <description> </description>
   <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty>
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
+  <properties/>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -48,12 +44,13 @@ python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.17">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.FileBuildParameters>
               <propertiesFile>${BUILD_TAG}.env</propertiesFile>
+              <failTriggerOnMissing>false</failTriggerOnMissing>
             </hudson.plugins.parameterizedtrigger.FileBuildParameters>
           </configs>
           <projects>mail_sender, </projects>
@@ -64,10 +61,10 @@ python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
     </hudson.plugins.parameterizedtrigger.BuildTrigger>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.16">
       <deleteDirs>false</deleteDirs>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <EnvInjectBuildWrapper>
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
         <propertiesContent>GIT_CACHE_DIR=${JENKINS_HOME}/git
-- 
2.7.4