Merge lp:~canonical-platform-qa/qa-jenkins-jobs/list-and-manifest into lp:qa-jenkins-jobs

Proposed by Max Brustkern
Status: Merged
Approved by: Max Brustkern
Approved revision: 183
Merged at revision: 183
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/list-and-manifest
Merge into: lp:qa-jenkins-jobs
Diff against target: 79 lines (+16/-4)
1 file modified
jobs/iso-testing/jobs.yaml (+16/-4)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/list-and-manifest
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
Joshua Powers (community) Approve
Review via email: mp+306526@code.launchpad.net

Commit message

Check .list as well as .manifest when polling URLs

Description of the change

This branch checks the .list file in addition to the .manifest file to determine whether a new ISO has been published.

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

LGTM

review: Approve
Revision history for this message
platform-qa-bot (platform-qa-bot) :
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.yaml'
2--- jobs/iso-testing/jobs.yaml 2016-09-21 14:43:43 +0000
3+++ jobs/iso-testing/jobs.yaml 2016-09-22 19:29:03 +0000
4@@ -212,7 +212,7 @@
5 parameters:
6 - download-sleep
7 node: 'iso-testing'
8- triggers: # Check the image manifest for changes every every 15 minutes
9+ triggers: # Check the image manifest and file list for changes every every 15 minutes
10 - pollurl:
11 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
12 polling-node: 'iso-testing'
13@@ -220,6 +220,9 @@
14 - url: 'http://cdimage.ubuntu.com/{flavor}/daily-live/pending/{dev-release}-desktop-{arch}.manifest'
15 check-content:
16 - simple: true
17+ - url: 'http://cdimage.ubuntu.com/{flavor}/daily-live/pending/{dev-release}-desktop-{arch}.list'
18+ check-content:
19+ - simple: true
20 builders:
21 - download-iso:
22 release: '{dev-release}'
23@@ -236,7 +239,7 @@
24 parameters:
25 - download-sleep
26 node: 'iso-testing'
27- triggers: # Check the image manifest for changes every every 15 minutes
28+ triggers: # Check the image manifest and file list for changes every every 15 minutes
29 - pollurl:
30 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
31 polling-node: 'iso-testing'
32@@ -244,6 +247,9 @@
33 - url: 'http://cdimage.ubuntu.com/{lts-release}/daily-live/pending/{lts-release}-desktop-{arch}.manifest'
34 check-content:
35 - simple: true
36+ - url: 'http://cdimage.ubuntu.com/{lts-release}/daily-live/pending/{lts-release}-desktop-{arch}.list'
37+ check-content:
38+ - simple: true
39 builders:
40 - download-iso:
41 release: '{lts-release}'
42@@ -260,7 +266,7 @@
43 parameters:
44 - download-sleep
45 node: 'iso-testing'
46- triggers: # Check the image manifest for changes every every 15 minutes
47+ triggers: # Check the image manifest and file list for changes every every 15 minutes
48 - pollurl:
49 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
50 polling-node: 'iso-testing'
51@@ -268,6 +274,9 @@
52 - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-{arch}.manifest'
53 check-content:
54 - simple: true
55+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/daily/pending/{dev-release}-server-{arch}.list'
56+ check-content:
57+ - simple: true
58 builders:
59 - download-iso:
60 release: '{dev-release}'
61@@ -284,7 +293,7 @@
62 parameters:
63 - download-sleep
64 node: 'iso-testing'
65- triggers: # Check the image manifest for changes every every 15 minutes
66+ triggers: # Check the image manifest and file list for changes every every 15 minutes
67 - pollurl:
68 cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
69 polling-node: 'iso-testing'
70@@ -292,6 +301,9 @@
71 - url: 'http://cdimage.ubuntu.com/ubuntu-server/{lts-release}/daily/pending/{lts-release}-server-{arch}.manifest'
72 check-content:
73 - simple: true
74+ - url: 'http://cdimage.ubuntu.com/ubuntu-server/{lts-release}/daily/pending/{lts-release}-server-{arch}.list'
75+ check-content:
76+ - simple: true
77 builders:
78 - download-iso:
79 release: '{lts-release}'

Subscribers

People subscribed via source and target branches