cupstream2distro Configuration

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

  1. fix-lp1192508-lp1199490
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Chris Gagnon
Approved revision: 501
Merged at revision: 501
Proposed branch: lp:~fginther/cupstream2distro-config/fix-lp1192508-lp1199490
Merge into: lp:cupstream2distro-config
Diff against target: 33 lines (+5/-5)
2 files modified
ci/jenkins-templates/mbs-autolanding-config.xml.tmpl (+3/-3)
ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl (+2/-2)
To merge this branch: bzr merge lp:~fginther/cupstream2distro-config/fix-lp1192508-lp1199490
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Chris Gagnon (community) Approve
Francis Ginther Approve
Review via email: mp+173793@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Francis Ginther (fginther) wrote :

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

review: Approve
Revision history for this message
Chris Gagnon (chris.gagnon) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ci/jenkins-templates/mbs-autolanding-config.xml.tmpl'
2--- ci/jenkins-templates/mbs-autolanding-config.xml.tmpl 2013-05-23 19:06:52 +0000
3+++ ci/jenkins-templates/mbs-autolanding-config.xml.tmpl 2013-07-09 19:14:22 +0000
4@@ -62,9 +62,9 @@
5 <triggerWithNoParameters>false</triggerWithNoParameters>
6 <block>
7 <buildStepFailureThreshold>
8- <name>FAILURE</name>
9- <ordinal>2</ordinal>
10- <color>RED</color>
11+ <name>UNSTABLE</name>
12+ <ordinal>1</ordinal>
13+ <color>YELLOW</color>
14 </buildStepFailureThreshold>
15 <unstableThreshold>
16 <name>UNSTABLE</name>
17
18=== modified file 'ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl'
19--- ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl 2013-05-24 19:49:14 +0000
20+++ ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl 2013-07-09 19:14:22 +0000
21@@ -49,10 +49,10 @@
22 <assignedNode>{{ node_label }}</assignedNode>
23 <canRoam>false</canRoam>
24 <disabled>{{ disabled }}</disabled>
25- <blockBuildWhenDownstreamBuilding>true</blockBuildWhenDownstreamBuilding>
26+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
27 <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
28 <triggers class="vector"/>
29- <concurrentBuild>false</concurrentBuild>
30+ <concurrentBuild>{{ concurrent_jenkins_builds }}</concurrentBuild>
31 <builders>
32 <hudson.tasks.Shell>
33 <command>{{ acquire_hook_script }}</command>

Subscribers

People subscribed via source and target branches

to all changes: