Merge lp:~fginther/cupstream2distro-config/fix-pbuilder-hooks into lp:cupstream2distro-config
Status: | Merged |
---|---|
Approved by: | Martin Mrazik |
Approved revision: | 333 |
Merged at revision: | 340 |
Proposed branch: | lp:~fginther/cupstream2distro-config/fix-pbuilder-hooks |
Merge into: | lp:cupstream2distro-config |
Diff against target: |
157 lines (+75/-4) 4 files modified
c2dconfigutils/cu2dUpdateCi.py (+11/-2) ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl (+1/-1) ci/jenkins-templates/pbuilder-config.xml.tmpl (+1/-1) tests/test_cu2dUpdateCi.py (+62/-0) |
To merge this branch: | bzr merge lp:~fginther/cupstream2distro-config/fix-pbuilder-hooks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Mrazik (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+164823@code.launchpad.net |
Commit message
Use different jenkins parameter names to specify the hooks list for the parent and the child builder jobs. The $hooks value is always inherited from the parent job and as a result, it was not possible to specify unique hooks for the builder jobs using $hooks. The child builder jobs will use $builder_hooks instead.
Description of the change
Use different jenkins parameter names to specify the hooks list for the parent and the child builder jobs. The $hooks value is always inherited from the parent job and as a result, it was not possible to specify unique hooks for the builder jobs using $hooks. The child builder jobs will use $builder_hooks instead.
Some jobs (i.e. compiz and unity) have different hooks for specific pbuilder jobs. The idea was to use these different hooks to skip the coverage build for armhf and get a faster build. However, this is not working in practice because the builder jobs are always inheriting the $hooks value from the parent. The solution is to not use the $hooks parameter for the actual pbuilder hooks value, instead it uses $builder_hooks which contains the value generated at job deployment time and ignores the value of $hooks. This still allows a parent to pass a $hooks value to a non cu2d-config child job.
FAILED: Continuous integration, rev:332 jenkins. qa.ubuntu. com/job/ cupstream2distr o-config- ci/245/ jenkins. qa.ubuntu. com/job/ cupstream2distr o-config- saucy-amd64- ci/43/console
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ cupstream2distr o-config- ci/245/ rebuild
http://