Update job conf because plugin upgrade
authorLin Yang <lin.a.yang@intel.com>
Fri, 9 Aug 2013 10:32:10 +0000 (18:32 +0800)
committerLin Yang <lin.a.yang@intel.com>
Fri, 9 Aug 2013 10:32:10 +0000 (18:32 +0800)
Change-Id: Ia92553b9ae366c8eba77717e0abedde8383af202
Signed-off-by: Lin Yang <lin.a.yang@intel.com>
jobs/build-check/config.xml
jobs/delete-tag/config.xml
jobs/image-creator/config.xml
jobs/mail_sender/config.xml
jobs/policy-check/config.xml
jobs/pre-release-cleanup/config.xml
jobs/pre-release-create/config.xml
jobs/pre-release-gerrit/config.xml
jobs/requests/config.xml
jobs/submit-obs/config.xml

index 764a8bd..171a274 100644 (file)
@@ -9,7 +9,11 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <quietPeriod>10</quietPeriod>
   <assignedNode>master</assignedNode>
@@ -37,7 +41,7 @@ if(matcher_build?.matches() &amp;&amp; matcher_prj?.matches()) {
 }</groovyScript>
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.17">
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.18">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
@@ -56,6 +60,7 @@ if(matcher_build?.matches() &amp;&amp; matcher_prj?.matches()) {
   <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_buildcheck_post.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
@@ -65,7 +70,7 @@ if(matcher_build?.matches() &amp;&amp; matcher_prj?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
index 2368714..9b7a353 100644 (file)
@@ -9,10 +9,14 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
-  <disabled>true</disabled>
+  <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers class="vector">
       <command>#!/bin/bash
 set -x
 
-${JENKINS_HOME}/jenkins-scripts/job_deletetag.sh</command>
+python jenkins-scripts/job_deletetag.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
     <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.16">
       <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4">
+      <includes>configuration, jenkins-scripts/job_deletetag.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
+      <excludes></excludes>
+      <flatten>false</flatten>
+      <includeAntExcludes>false</includeAntExcludes>
+      <hudsonHomeRelative>false</hudsonHomeRelative>
+      <relativeTo>userContent</relativeTo>
+    </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
-        <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
+        <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
       </info>
     </EnvInjectBuildWrapper>
index 6d24e2f..cd16749 100644 (file)
@@ -3,7 +3,11 @@
   <actions/>
   <description></description>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>imager</assignedNode>
   <canRoam>false</canRoam>
@@ -32,9 +36,16 @@ python jenkins-scripts/job_imager.py</command>
 }</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>
@@ -46,7 +57,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.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
index 80ddcb6..825d63c 100644 (file)
@@ -9,7 +9,11 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>true</disabled>
   <builders>
     <hudson.tasks.Shell>
       <command>#!/bin/bash
+set -x
 
-python ${JENKINS_HOME}/jenkins-scripts/job_mail_sender.py</command>
+python jenkins-scripts/job_mail_sender.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4">
+      <includes>configuration, jenkins-scripts/job_mail_sender.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
+      <excludes></excludes>
+      <flatten>false</flatten>
+      <includeAntExcludes>false</includeAntExcludes>
+      <hudsonHomeRelative>false</hudsonHomeRelative>
+      <relativeTo>userContent</relativeTo>
+    </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
-        <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
+        <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
       </info>
     </EnvInjectBuildWrapper>
index 2f8a4db..5475732 100644 (file)
@@ -9,7 +9,11 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>master</assignedNode>
   <canRoam>false</canRoam>
@@ -68,6 +72,7 @@ python jenkins-scripts/job_policycheck.py</command>
   <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_policycheck.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
@@ -77,7 +82,7 @@ python jenkins-scripts/job_policycheck.py</command>
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
index 6f0e722..730811c 100644 (file)
@@ -9,7 +9,11 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <quietPeriod>0</quietPeriod>
   <assignedNode>download</assignedNode>
@@ -41,6 +45,7 @@ if(matcher?.matches()) {
   <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_pre_release_obs.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
@@ -50,7 +55,7 @@ if(matcher?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
index 8c34adb..582da58 100644 (file)
@@ -9,9 +9,13 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
-  <quietPeriod>0</quietPeriod>
+  <quietPeriod>30</quietPeriod>
   <assignedNode>download</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
@@ -27,7 +31,7 @@ python jenkins-scripts/job_pre_release_obs.py create_images
 
 </command>
     </hudson.tasks.Shell>
-    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.17">
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.18">
       <configs>
         <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
           <configs class="empty-list"/>
@@ -71,6 +75,7 @@ if(matcher?.matches()) {
   <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_pre_release_obs.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
@@ -80,7 +85,7 @@ if(matcher?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
index 7bfa52b..fe8b518 100644 (file)
@@ -9,7 +9,11 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>package-build</assignedNode>
   <canRoam>false</canRoam>
@@ -73,8 +77,9 @@ python ${JENKINS_HOME}/jenkins-scripts/job_pre_release_gerrit.py</command>
   <buildWrappers>
     <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.16">
       <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
index 816ef39..a10ff65 100644 (file)
@@ -3,38 +3,17 @@
   <actions/>
   <description> </description>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector">
-    <com.intel.jenkins.plugins.obsevent.trigger.ObsEventTrigger>
-      <spec></spec>
-      <interestedEvents>
-        <com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-          <compareType>PLAIN</compareType>
-          <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_SRCSRV_REQUEST_ACCEPTED&quot; } } };</pattern>
-        </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-        <com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-          <compareType>PLAIN</compareType>
-          <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_SRCSRV_REQUEST_STATECHANGE&quot; } } };</pattern>
-        </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-        <com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-          <compareType>PLAIN</compareType>
-          <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_SRCSRV_REQUEST_CREATE&quot; } } };</pattern>
-        </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-      </interestedEvents>
-      <amqpHost>127.0.0.1</amqpHost>
-      <amqpPort>5672</amqpPort>
-      <amqpVhost>boss</amqpVhost>
-      <amqpUser>boss</amqpUser>
-      <amqpPass>boss</amqpPass>
-      <amqpQueue>requests</amqpQueue>
-      <logging>LOGGING_NONE</logging>
-    </com.intel.jenkins.plugins.obsevent.trigger.ObsEventTrigger>
-  </triggers>
+  <triggers class="vector"/>
   <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
@@ -44,7 +23,7 @@ python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.17">
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.18">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
@@ -63,8 +42,9 @@ python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
   <buildWrappers>
     <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.16">
       <deleteDirs>false</deleteDirs>
+      <cleanupParameter></cleanupParameter>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
         <propertiesContent>GIT_CACHE_DIR=${JENKINS_HOME}/git
index 6585164..d254201 100644 (file)
@@ -9,7 +9,11 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>package-build</assignedNode>
   <canRoam>false</canRoam>
@@ -73,7 +77,7 @@ if(matcher?.matches()) {
 }</groovyScript>
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.17">
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.18">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
@@ -92,6 +96,7 @@ if(matcher?.matches()) {
   <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_submitobs.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
@@ -101,7 +106,7 @@ if(matcher?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.87">
+    <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>