Block prerelease when create-snapshot is running

And set create-snapshot is high priority than prerelease.

Fixes: #2145

Change-Id: I108266fe717d9d45b6ff10ed1a8d8e96271ac0cd
Signed-off-by: Xu Chang <changx.xu@intel.com>

diff --git a/jobs/create-snapshot/config.xml b/jobs/create-snapshot/config.xml
index 16cadd1..2a6041c 100644 (file)
--- a/jobs/create-snapshot/config.xml
+++ b/jobs/create-snapshot/config.xml
@@ -10,8 +10,12 @@
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <hudson.plugins.buildblocker.BuildBlockerProperty plugin="build-blocker-plugin@1.4.1">
+      <useBuildBlocker>true</useBuildBlocker>
+      <blockingJobs>pre-release-create</blockingJobs>
+    </hudson.plugins.buildblocker.BuildBlockerProperty>
     <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@2.8">
-      <priority>100</priority>
+      <priority>101</priority>
     </hudson.queueSorter.PrioritySorterJobProperty>
     <hudson.model.ParametersDefinitionProperty>
       <parameterDefinitions>
@@ -30,7 +34,7 @@
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
-  <concurrentBuild>false</concurrentBuild>
+  <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
       <command>python ${WORKSPACE}/jenkins-scripts/job_create_snapshot.py</command>
@@ -110,7 +114,9 @@ if(matcher?.matches()) {
       <strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
         <timeoutMinutes>60</timeoutMinutes>
       </strategy>
-      <operationList/>
+      <operationList>
+        <hudson.plugins.build__timeout.operations.FailOperation/>
+      </operationList>
     </hudson.plugins.build__timeout.BuildTimeoutWrapper>
     <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4.3">
       <includes>configuration, jenkins-scripts/job_create_snapshot.py, jenkins-scripts/common/*</includes>

diff --git a/jobs/pre-release-create/config.xml b/jobs/pre-release-create/config.xml
index 70f0518..fc12bd7 100644 (file)
--- a/jobs/pre-release-create/config.xml
+++ b/jobs/pre-release-create/config.xml
@@ -10,6 +10,10 @@
   </logRotator>
   <keepDependencies>false</keepDependencies>
   <properties>
+    <hudson.plugins.buildblocker.BuildBlockerProperty plugin="build-blocker-plugin@1.4.1">
+      <useBuildBlocker>true</useBuildBlocker>
+      <blockingJobs>create-snapshot</blockingJobs>
+    </hudson.plugins.buildblocker.BuildBlockerProperty>
     <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@2.8">
       <priority>100</priority>
     </hudson.queueSorter.PrioritySorterJobProperty>
@@ -31,7 +35,7 @@
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
-  <concurrentBuild>false</concurrentBuild>
+  <concurrentBuild>true</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
       <command>#/bin/bash