canonical-ubuntu-qa team mailing list archive

[Paride Legovini <mp+474476@xxxxxxxxxxxxxxxxxx>]

Paride Legovini has proposed merging ~paride/qa-jenkins-jobs:fix-desktop-iso-download-polling into qa-jenkins-jobs:master.

Requested reviews:
  Canonical Platform QA Team (canonical-platform-qa)

For more details, see:
https://code.launchpad.net/~paride/qa-jenkins-jobs/+git/qa-jenkins-jobs/+merge/474476
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of ~paride/qa-jenkins-jobs:fix-desktop-iso-download-polling into qa-jenkins-jobs:master.

diff --git a/jobs/iso-testing/jobs.yaml b/jobs/iso-testing/jobs.yaml
index 67839b2..febffe7 100644
--- a/jobs/iso-testing/jobs.yaml
+++ b/jobs/iso-testing/jobs.yaml
@@ -164,18 +164,14 @@
         - download-sleep
     node: 'iso-testing-{arch}'
     triggers:
-        # Check the image manifest and file list for changes every every 15 minutes
-        # - daily
-        # Currently working with IS to determine the best method - https://portal.admin.canonical.com/101149
         - pollurl:
-            cron: 'H/15 * * * *'  # The H allows jenkins to stagger jobs using a hash
+            cron: '@hourly'
             polling-node: 'iso-testing'
             urls:
-                - url: !j2: "{{ {'desktop': 'http://cdimage.ubuntu.com/daily-live/pending/SHA256SUMS'}[variant] }}"
-                  check-etag: false
-                  check-date: true
-                  check-content:
-                      - simple: true
+              - url: 'http://cdimage.ubuntu.com/daily-live/pending/.publish_info#iso-download-{variant}-{arch}'
+                check-content:
+                  - text:
+                      - !j2: '^{{release}}-.*-{{arch | replace("+", "\+") }}.iso .+$'
     wrappers:
       - timeout:
           timeout: 30
@@ -199,18 +195,14 @@
         - download-sleep
     node: 'iso-testing-{arch}'
     triggers:
-        # Check the image manifest and file list for changes every every 15 minutes
-        # - daily
-        # Currently working with IS to determine the best method - https://portal.admin.canonical.com/101149
         - pollurl:
-            cron: 'H/15 * * * *'  # The H allows jenkins to stagger jobs using a hash
+            cron: '@hourly'
             polling-node: 'iso-testing'
             urls:
-                - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/SHA256SUMS'
-                  check-etag: false
-                  check-date: true
-                  check-content:
-                      - simple: true
+              - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/.publish_info#iso-download-{variant}-{arch}'
+                check-content:
+                  - text:
+                      - !j2: '^{{release}}-.*-{{arch | replace("+", "\+") }}.iso .+$'
     wrappers:
       - timeout:
           timeout: 30