projects / services / jenkins-jobs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 122d0fc)
Updated job configuration changes
authorEd Bartosh <eduard.bartosh@intel.com>
Mon, 22 Jul 2013 17:55:33 +0000 (20:55 +0300)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Wed, 24 Jul 2013 13:14:20 +0000 (06:14 -0700)
Similar changes to multiple jobs. Mainly caused by priority plugin(no
default value anymore) and plugin version upgrades.

Change-Id: I76229d91db65b39efbd3f52afcb99830b5e7f587
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
jobs/delete-tag/config.xml patch | blob | history
jobs/mail_sender/config.xml patch | blob | history
jobs/policy-check/config.xml patch | blob | history
jobs/pre-release-cleanup/config.xml patch | blob | history
jobs/pre-release-gerrit/config.xml patch | blob | history
jobs/submit-obs/config.xml patch | blob | history

diff --git a/jobs/delete-tag/config.xml b/jobs/delete-tag/config.xml
index 9a9cecd..2368714 100644 (file)
--- a/jobs/delete-tag/config.xml
+++ b/jobs/delete-tag/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"/>
   <canRoam>true</canRoam>
   <disabled>true</disabled>
@@ -70,10 +66,10 @@ ${JENKINS_HOME}/jenkins-scripts/job_deletetag.sh</command>
   </builders>
   <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>
-    <EnvInjectBuildWrapper plugin="envinject@1.64">
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
diff --git a/jobs/mail_sender/config.xml b/jobs/mail_sender/config.xml
index 49c5834..80ddcb6 100644 (file)
--- a/jobs/mail_sender/config.xml
+++ b/jobs/mail_sender/config.xml
@@ -2,18 +2,14 @@
 <project>
   <actions/>
   <description>This job will be triggered by others to send out email.</description>
-  <logRotator>
+  <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>7</daysToKeep>
     <numToKeep>-1</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty>
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
+  <properties/>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>true</disabled>
@@ -30,7 +26,7 @@ python ${JENKINS_HOME}/jenkins-scripts/job_mail_sender.py</command>
   </builders>
   <publishers/>
   <buildWrappers>
-    <EnvInjectBuildWrapper>
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
diff --git a/jobs/policy-check/config.xml b/jobs/policy-check/config.xml
index 7cc07fe..2f8a4db 100644 (file)
--- a/jobs/policy-check/config.xml
+++ b/jobs/policy-check/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"/>
   <assignedNode>master</assignedNode>
   <canRoam>false</canRoam>
@@ -70,7 +66,7 @@ python jenkins-scripts/job_policycheck.py</command>
   </builders>
   <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">
@@ -81,7 +77,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.64">
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
diff --git a/jobs/pre-release-cleanup/config.xml b/jobs/pre-release-cleanup/config.xml
index e4fe46c..6f0e722 100644 (file)
--- a/jobs/pre-release-cleanup/config.xml
+++ b/jobs/pre-release-cleanup/config.xml
@@ -2,18 +2,14 @@
 <project>
   <actions/>
   <description>    </description>
-  <logRotator>
+  <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
     <numToKeep>1000</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty>
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
+  <properties/>
   <scm class="hudson.scm.NullSCM"/>
   <quietPeriod>0</quietPeriod>
   <assignedNode>download</assignedNode>
@@ -31,7 +27,7 @@ python ${WORKSPACE}/jenkins-scripts/job_pre_release_obs.py cleanup</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
-    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@1.8">
       <groovyScript>def matcher = manager.getMatcher(manager.build.logFile, &quot;home:hudson:prerelease:(.*)&quot;)
 if(matcher?.matches()) {
     manager.addShortText(matcher.group(1))
@@ -43,10 +39,10 @@ if(matcher?.matches()) {
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
   </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>
-    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+    <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>
       <excludes></excludes>
       <flatten>false</flatten>
@@ -54,7 +50,7 @@ if(matcher?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper>
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
diff --git a/jobs/pre-release-gerrit/config.xml b/jobs/pre-release-gerrit/config.xml
index c283e1d..7bfa52b 100644 (file)
--- a/jobs/pre-release-gerrit/config.xml
+++ b/jobs/pre-release-gerrit/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"/>
   <assignedNode>package-build</assignedNode>
   <canRoam>false</canRoam>
@@ -75,10 +71,10 @@ python ${JENKINS_HOME}/jenkins-scripts/job_pre_release_gerrit.py</command>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
   </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>
-    <EnvInjectBuildWrapper plugin="envinject@1.64">
+    <EnvInjectBuildWrapper plugin="envinject@1.87">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
         <loadFilesFromMaster>false</loadFilesFromMaster>
diff --git a/jobs/submit-obs/config.xml b/jobs/submit-obs/config.xml
index 77f5913..6585164 100644 (file)
--- a/jobs/submit-obs/config.xml
+++ b/jobs/submit-obs/config.xml
@@ -9,11 +9,7 @@
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@1.3">
-      <priority>101</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
+  <properties/>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>package-build</assignedNode>
   <canRoam>false</canRoam>
@@ -77,7 +73,7 @@ if(matcher?.matches()) {
 }</groovyScript>
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.18">
+    <hudson.plugins.parameterizedtrigger.BuildTrigger plugin="parameterized-trigger@2.17">
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
@@ -94,7 +90,7 @@ if(matcher?.matches()) {
     </hudson.plugins.parameterizedtrigger.BuildTrigger>
   </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">
@@ -105,7 +101,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>
Domain: SCM / CI Services;