Merge lp:~fginther/cupstream2distro-config/fix-lp1192508-lp1199490 into lp:cupstream2distro-config

[Francis Ginther]

Fix MBS ci builder concurrency issue (lp:1192508) and MBS multiple autolanding vote issue (lp:1199490).

Fix MBS ci builder concurrency issue (lp:1192508) and MBS multiple autolanding vote issue (lp:1199490).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~fginther/cupstream2distro-config/fix-lp1192508-lp1199490/+merge/173793/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/155

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/357/rebuild

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Self-approving, this is just a merge from the other template files.

review: Approve

[Chris Gagnon (chris.gagnon)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'ci/jenkins-templates/mbs-autolanding-config.xml.tmpl'
--- ci/jenkins-templates/mbs-autolanding-config.xml.tmpl	2013-05-23 19:06:52 +0000
+++ ci/jenkins-templates/mbs-autolanding-config.xml.tmpl	2013-07-09 19:14:22 +0000
@@ -62,9 +62,9 @@
           <triggerWithNoParameters>false</triggerWithNoParameters>
           <block>
             <buildStepFailureThreshold>
-              <name>FAILURE</name>
-              <ordinal>2</ordinal>
-              <color>RED</color>
+              <name>UNSTABLE</name>
+              <ordinal>1</ordinal>
+              <color>YELLOW</color>
             </buildStepFailureThreshold>
             <unstableThreshold>
               <name>UNSTABLE</name>
 
=== modified file 'ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl'
--- ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl	2013-05-24 19:49:14 +0000
+++ ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl	2013-07-09 19:14:22 +0000
@@ -49,10 +49,10 @@
   <assignedNode>{{ node_label }}</assignedNode>
   <canRoam>false</canRoam>
   <disabled>{{ disabled }}</disabled>
-  <blockBuildWhenDownstreamBuilding>true</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers class="vector"/>
-  <concurrentBuild>false</concurrentBuild>
+  <concurrentBuild>{{ concurrent_jenkins_builds }}</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
       <command>{{ acquire_hook_script }}</command>