Merge lp:~canonical-platform-qa/qa-jenkins-jobs/iso-trigger-etag into lp:qa-jenkins-jobs

Proposed by Max Brustkern
Status: Merged
Approved by: Joshua Powers
Approved revision: 239
Merged at revision: 239
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/iso-trigger-etag
Merge into: lp:qa-jenkins-jobs
Diff against target: 85 lines (+12/-24)
2 files modified
jobs/iso-testing/jobs-ppc64el.yaml (+4/-8)
jobs/iso-testing/jobs.yaml (+8/-16)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/iso-trigger-etag
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
Joshua Powers (community) Approve
Review via email: mp+321474@code.launchpad.net

Commit message

Check etags of iso files instead of contents/timings of property files.

Description of the change

This branch switches the url triggers to check the etags of the iso files.

To post a comment you must log in.
Revision history for this message
Joshua Powers (powersj) wrote :

LGTM thanks for doing this

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

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 2017-03-20 17:24:56 +0000
3+++ jobs/iso-testing/jobs-ppc64el.yaml 2017-03-30 17:53:27 +0000
4@@ -122,10 +122,8 @@
5 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
6 polling-node: 'iso-testing-ppc64el'
7 urls:
8- - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-ppc64el.manifest'
9- check-date: True
10- - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-ppc64el.list'
11- check-date: True
12+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-ppc64el.iso'
13+ check-etag: True
14 builders:
15 - download-iso:
16 release: '{dev-release}'
17@@ -147,10 +145,8 @@
18 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
19 polling-node: 'iso-testing-ppc64el'
20 urls:
21- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-ppc64el.manifest'
22- check-date: True
23- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-ppc64el.list'
24- check-date: True
25+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-ppc64el.iso'
26+ check-etag: True
27 builders:
28 - download-iso:
29 release: '{supported-release}'
30
31=== modified file 'jobs/iso-testing/jobs.yaml'
32--- jobs/iso-testing/jobs.yaml 2017-03-20 17:24:56 +0000
33+++ jobs/iso-testing/jobs.yaml 2017-03-30 17:53:27 +0000
34@@ -220,10 +220,8 @@
35 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
36 polling-node: 'iso-testing'
37 urls:
38- - url: 'http://cdimage.ubuntu.com/{flavor}/daily-live/pending/{dev-release}-desktop-{arch}.manifest'
39- check-date: True
40- - url: 'http://cdimage.ubuntu.com/{flavor}/daily-live/pending/{dev-release}-desktop-{arch}.list'
41- check-date: True
42+ - url: 'http://cdimage.ubuntu.com/{flavor}/daily-live/pending/{dev-release}-desktop-{arch}.iso'
43+ check-etag: True
44 builders:
45 - download-iso:
46 release: '{dev-release}'
47@@ -245,10 +243,8 @@
48 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
49 polling-node: 'iso-testing'
50 urls:
51- - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/{supported-release}-desktop-{arch}.manifest'
52- check-date: True
53- - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/{supported-release}-desktop-{arch}.list'
54- check-date: True
55+ - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/{supported-release}-desktop-{arch}.iso'
56+ check-etag: True
57 builders:
58 - download-iso:
59 release: '{supported-release}'
60@@ -270,10 +266,8 @@
61 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
62 polling-node: 'iso-testing'
63 urls:
64- - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-{arch}.manifest'
65- check-date: True
66- - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-{arch}.list'
67- check-date: True
68+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-{arch}.iso'
69+ check-etag: True
70 builders:
71 - download-iso:
72 release: '{dev-release}'
73@@ -295,10 +289,8 @@
74 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
75 polling-node: 'iso-testing'
76 urls:
77- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-{arch}.manifest'
78- check-date: True
79- - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-{arch}.list'
80- check-date: True
81+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{supported-release}/daily/pending/{supported-release}-server-{arch}.iso'
82+ check-etag: True
83 builders:
84 - download-iso:
85 release: '{supported-release}'

Subscribers

People subscribed via source and target branches