Merge lp:~canonical-platform-qa/qa-jenkins-jobs/hooks-configurable into lp:qa-jenkins-jobs

Proposed by Allan LeSage
Status: Merged
Approved by: Max Brustkern
Approved revision: 46
Merged at revision: 43
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/hooks-configurable
Merge into: lp:qa-jenkins-jobs
Diff against target: 58 lines (+11/-8)
2 files modified
defaults.yaml (+1/-0)
mp-ci-autoland/ci-jobs.yaml (+10/-8)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/hooks-configurable
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Christopher Lee (community) Needs Information
Review via email: mp+290668@code.launchpad.net

Commit message

Configurable hooks.

Description of the change

Move hooks up to surface of job/project so that they can be configured, need this for ubuntu-system-tests to add ppa:canonical-platform-qa/ppa for uci-config.

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

Looking good. It would be even better if it was possible to have defaults for {hooks} to save on repetition.

review: Needs Information
45. By Allan LeSage

Defaults for hooks/target_project.

46. By Allan LeSage

Change default schema adding hooks.

Revision history for this message
Max Brustkern (nuclearbob) wrote :

This looks like it should work to me. We can discuss the default thing tomorrow.

Revision history for this message
Max Brustkern (nuclearbob) wrote :

I've run a number of tests on this locally, and everything appears to build as I would expect, defaults included. I think this should be good to go.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'defaults.yaml'
2--- defaults.yaml 2016-03-09 16:19:56 +0000
3+++ defaults.yaml 2016-04-01 01:47:42 +0000
4@@ -5,3 +5,4 @@
5 numToKeep: 20
6 artifactDaysToKeep: 20
7 artifactNumToKeep: 20
8+ hooks: 'H05set_package_version H10strip_native_depends'
9
10=== modified file 'mp-ci-autoland/ci-jobs.yaml'
11--- mp-ci-autoland/ci-jobs.yaml 2016-03-30 21:05:04 +0000
12+++ mp-ci-autoland/ci-jobs.yaml 2016-04-01 01:47:42 +0000
13@@ -195,9 +195,10 @@
14 - 'generic-update-mp'
15 target_project:
16 # Must be projects lp:<name>
17- - 'autopilot'
18- - 'auto-upgrade-testing'
19- - 'ubuntu-system-tests'
20+ - autopilot
21+ - auto-upgrade-testing
22+ - ubuntu-system-tests:
23+ hooks: 'H05set_package_version H10strip_native_depends D09add_ppa~canonical-platform-qa~ppa'
24 dist:
25 - wily
26 arch:
27@@ -257,7 +258,7 @@
28 - trigger-deb-builders:
29 landing_candidate: {landing_candidate}
30 target_branch: 'lp:{target_project}'
31- hooks: 'H05set_package_version H10strip_native_depends'
32+ hooks: '{hooks}'
33 parallelism: 1
34 - upcopy-i386-from-downstream
35 - upcopy-amd64-from-downstream
36@@ -354,9 +355,10 @@
37 - 'generic-land-mp'
38 target_project:
39 # Must be lp:<name>
40- - 'autopilot'
41- - 'auto-upgrade-testing'
42- - 'ubuntu-system-tests'
43+ - autopilot
44+ - auto-upgrade-testing
45+ - ubuntu-system-tests:
46+ hooks: 'H05set_package_version H10strip_native_depends D09add_ppa~canonical-platform-qa~ppa'
47
48 - job-template:
49 name: '{target_project}-autoland'
50@@ -380,7 +382,7 @@
51 - trigger-deb-builders:
52 landing_candidate: {landing_candidate}
53 target_branch: 'lp:{target_project}'
54- hooks: 'H05set_package_version H10strip_native_depends'
55+ hooks: '{hooks}'
56 parallelism: 1
57 - 'trigger-generic-land-mp'
58 publishers:

Subscribers

People subscribed via source and target branches