Merge lp:~canonical-platform-qa/qa-jenkins-jobs/add-current-release into lp:qa-jenkins-jobs

Proposed by Max Brustkern
Status: Merged
Approved by: Joshua Powers
Approved revision: 197
Merged at revision: 195
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/add-current-release
Merge into: lp:qa-jenkins-jobs
Diff against target: 145 lines (+20/-18)
2 files modified
jobs/iso-testing/jobs-ppc64el.yaml (+8/-7)
jobs/iso-testing/jobs.yaml (+12/-11)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/add-current-release
Reviewer Review Type Date Requested Status
Joshua Powers (community) Approve
platform-qa-bot continuous-integration Approve
Review via email: mp+313857@code.launchpad.net

Commit message

Add current non-lts release support

Description of the change

This branch deploys tests for a current non-lts release

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Joshua Powers (powersj) wrote :

Yakkety is misspelled.

There are 6 remaining references still to the old variable "lts-release", which will prevent deployment. As you changed these to "supported-release" they need to be updated, here is a diff:

https://paste.ubuntu.com/23735911/

Also line 124 of jobs/iso-testing/jobs-ppc64el.yaml:
            polling-node: 'iso-testing-ppc64l'
needs to be:
            polling-node: 'iso-testing-ppc64el'

Once I made those changes I was able to create 306 jobs. Here is the breakdown:

* 2 admin jobs
* 76 jobs per release

review: Needs Fixing
196. By Max Brustkern

Fixes from powersj

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

Those should be fixed now. Let me know if you see any further problems. Thanks for the thorough check, I was clearly not on top of my game. :)

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Joshua Powers (powersj) wrote :

LGTM

Test deploy created 306 jobs again, 2 admin jobs and 18 per server/release/architecture.

review: Approve
197. By Max Brustkern

Another typo fix

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

Fixed the other one I forgot to fix before. If it looks good now, we can top-approve and land it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/iso-testing/jobs-ppc64el.yaml'
2--- jobs/iso-testing/jobs-ppc64el.yaml 2016-12-23 17:47:28 +0000
3+++ jobs/iso-testing/jobs-ppc64el.yaml 2017-01-04 16:51:08 +0000
4@@ -27,9 +27,10 @@
5 - 'zesty'
6 dev-release: # Current development release has different download path
7 - 'zesty'
8- lts-release: # All lts releases which should be tested go here
9+ supported-release: # All non-dev releases which should be tested go here
10 - 'trusty'
11 - 'xenial'
12+ - 'yakkety'
13 server-test: # Currently this is all non-default server test cases
14 - 'ceph'
15 - 'dns-server'
16@@ -49,7 +50,7 @@
17 node: 'iso-testing-ppc64el'
18 jobs:
19 - 'ubuntu-{dev-release}-server-ppc64el-iso-download'
20- - 'ubuntu-{lts-release}-server-ppc64el-iso-download'
21+ - 'ubuntu-{supported-release}-server-ppc64el-iso-download'
22 - 'ubuntu-{release}-server-ppc64el-iso-static-validation'
23 - 'ubuntu-{release}-server-ppc64el-smoke-default'
24 - 'ubuntu-{release}-server-ppc64el-smoke-{server-test}'
25@@ -120,7 +121,7 @@
26 triggers: # Check the image manifest and file list for changes every every 15 minutes
27 - pollurl:
28 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
29- polling-node: 'iso-testing-ppc64l'
30+ polling-node: 'iso-testing-ppc64el'
31 urls:
32 - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-ppc64el.manifest'
33 check-content:
34@@ -136,7 +137,7 @@
35 flavor: 'ubuntu-server'
36
37 - job-template:
38- name: 'ubuntu-{lts-release}-server-ppc64el-iso-download'
39+ name: 'ubuntu-{supported-release}-server-ppc64el-iso-download'
40 description: |
41 This job download the latest daily server iso
42 Defined in lp:qa-jenkins-jobs
43@@ -149,15 +150,15 @@
44 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
45 polling-node: 'iso-testing-ppc64el'
46 urls:
47- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{lts-release}/daily/pending/{lts-release}-server-ppc64el.manifest'
48+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-ppc64el.manifest'
49 check-content:
50 - simple: true
51- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{lts-release}/daily/pending/{lts-release}-server-ppc64el.list'
52+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-ppc64el.list'
53 check-content:
54 - simple: true
55 builders:
56 - download-iso:
57- release: '{lts-release}'
58+ release: '{supported-release}'
59 variant: 'server'
60 arch: 'ppc64el'
61 flavor: 'ubuntu-server'
62
63=== modified file 'jobs/iso-testing/jobs.yaml'
64--- jobs/iso-testing/jobs.yaml 2016-10-26 16:06:42 +0000
65+++ jobs/iso-testing/jobs.yaml 2017-01-04 16:51:08 +0000
66@@ -33,9 +33,10 @@
67 - 'zesty'
68 dev-release: # Current development release has different download path
69 - 'zesty'
70- lts-release: # All lts releases which should be tested go here
71+ supported-release: # All non-dev releases which should be tested go here
72 - 'trusty'
73 - 'xenial'
74+ - 'yakkety'
75 arch: # Mostly likely different jobs would be needed for other arches
76 - 'amd64'
77 - 'i386'
78@@ -69,9 +70,9 @@
79 node: 'iso-testing'
80 jobs:
81 - '{flavor}-{dev-release}-desktop-{arch}-iso-download'
82- - '{flavor}-{lts-release}-desktop-{arch}-iso-download'
83+ - '{flavor}-{supported-release}-desktop-{arch}-iso-download'
84 - 'ubuntu-{dev-release}-server-{arch}-iso-download'
85- - 'ubuntu-{lts-release}-server-{arch}-iso-download'
86+ - 'ubuntu-{supported-release}-server-{arch}-iso-download'
87 - '{flavor}-{release}-desktop-{arch}-iso-static-validation'
88 - 'ubuntu-{release}-server-{arch}-iso-static-validation'
89 - '{flavor}-{release}-desktop-{arch}-smoke-default'
90@@ -232,7 +233,7 @@
91 flavor: '{flavor}'
92
93 - job-template:
94- name: '{flavor}-{lts-release}-desktop-{arch}-iso-download'
95+ name: '{flavor}-{supported-release}-desktop-{arch}-iso-download'
96 description: |
97 This job downloads the latest lts daily desktop iso
98 Defined in lp:qa-jenkins-jobs
99@@ -245,15 +246,15 @@
100 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
101 polling-node: 'iso-testing'
102 urls:
103- - url: 'http://cdimage.ubuntu.com/{lts-release}/daily-live/pending/{lts-release}-desktop-{arch}.manifest'
104+ - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/{supported-release}-desktop-{arch}.manifest'
105 check-content:
106 - simple: true
107- - url: 'http://cdimage.ubuntu.com/{lts-release}/daily-live/pending/{lts-release}-desktop-{arch}.list'
108+ - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/{supported-release}-desktop-{arch}.list'
109 check-content:
110 - simple: true
111 builders:
112 - download-iso:
113- release: '{lts-release}'
114+ release: '{supported-release}'
115 variant: 'desktop'
116 arch: '{arch}'
117 flavor: '{flavor}'
118@@ -286,7 +287,7 @@
119 flavor: 'ubuntu-server'
120
121 - job-template:
122- name: 'ubuntu-{lts-release}-server-{arch}-iso-download'
123+ name: 'ubuntu-{supported-release}-server-{arch}-iso-download'
124 description: |
125 This job download the latest daily server iso
126 Defined in lp:qa-jenkins-jobs
127@@ -299,15 +300,15 @@
128 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
129 polling-node: 'iso-testing'
130 urls:
131- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{lts-release}/daily/pending/{lts-release}-server-{arch}.manifest'
132+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-{arch}.manifest'
133 check-content:
134 - simple: true
135- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{lts-release}/daily/pending/{lts-release}-server-{arch}.list'
136+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-{arch}.list'
137 check-content:
138 - simple: true
139 builders:
140 - download-iso:
141- release: '{lts-release}'
142+ release: '{supported-release}'
143 variant: 'server'
144 arch: '{arch}'
145 flavor: 'ubuntu-server'

Subscribers

People subscribed via source and target branches