Ural Tunaboyu has proposed merging qa-jenkins-jobs:iso-download-fix into
qa-jenkins-jobs:master.
Requested reviews:
Canonical Platform QA Team (canonical-platform-qa)
For more details, see:
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/+git/qa-jenkins-jobs/+merge/474590
Replaced `supported-release` and `dev-release` with `supported_release` and
`dev_release` respectively so they can be used in templates. Replaced `release`
with `dev_release` and `supported_release` as appropriate in iso-download job
definitions so that the URL polling regex is generated correctly by JJB.
--
Your team Canonical Platform QA Team is requested to review the proposed merge
of qa-jenkins-jobs:iso-download-fix into qa-jenkins-jobs:master.
diff --git a/jobs/iso-testing/jobs.yaml b/jobs/iso-testing/jobs.yaml
index febffe7..89b6a70 100644
--- a/jobs/iso-testing/jobs.yaml
+++ b/jobs/iso-testing/jobs.yaml
@@ -24,7 +24,7 @@
variant: 'desktop'
release: # Additional releases can be added here
- 'jammy'
- supported-release: # All non-dev releases which should be tested go here
+ supported_release: # All non-dev releases which should be tested go here
- 'jammy'
arch: # Mostly likely different jobs would be needed for other arches
- 'amd64'
@@ -35,7 +35,7 @@
- 'oem'
jobs:
- 'mark-pending-current'
- - '{flavor}-{supported-release}-{variant}-{arch}-iso-download'
+ - '{flavor}-{supported_release}-{variant}-{arch}-iso-download'
- '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
- '{flavor}-{release}-{variant}-{arch}-smoke-default'
- '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
@@ -48,9 +48,9 @@
release:
- 'noble'
- 'oracular'
- supported-release:
+ supported_release:
- 'noble'
- dev-release:
+ dev_release:
- 'oracular'
arch:
- 'amd64'
@@ -60,8 +60,8 @@
# the entry can be deleted once the change is confirmed
# - 'default_minimal'
jobs:
- - '{flavor}-{dev-release}-{variant}-{arch}-iso-download'
- - '{flavor}-{supported-release}-{variant}-{arch}-iso-download'
+ - '{flavor}-{dev_release}-{variant}-{arch}-iso-download'
+ - '{flavor}-{supported_release}-{variant}-{arch}-iso-download'
- '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
- '{flavor}-{release}-{variant}-{arch}-smoke-default'
- '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
@@ -156,7 +156,7 @@
# I'm not adding a job for that so it will never accidentally be deployed.
- job-template:
- name: '{flavor}-{dev-release}-{variant}-{arch}-iso-download'
+ name: '{flavor}-{dev_release}-{variant}-{arch}-iso-download'
description: |
This job downloads the latest daily desktop iso
Defined in lp:qa-jenkins-jobs
@@ -171,7 +171,7 @@
- url: 'http://cdimage.ubuntu.com/daily-live/pending/.publish_info#iso-download-{variant}-{arch}'
check-content:
- text:
- - !j2: '^{{release}}-.*-{{arch | replace("+", "\+") }}.iso .+$'
+ - !j2: '^{{dev_release}}-.*-{{arch | replace("+", "\+") }}.iso .+$'
wrappers:
- timeout:
timeout: 30
@@ -179,7 +179,7 @@
- timestamps
builders:
- download-iso:
- release: '{dev-release}'
+ release: '{dev_release}'
variant: '{variant}'
arch: '{arch}'
flavor: '{flavor}'
@@ -187,7 +187,7 @@
- email-canonical-ubuntu-qa
- job-template:
- name: '{flavor}-{supported-release}-{variant}-{arch}-iso-download'
+ name: '{flavor}-{supported_release}-{variant}-{arch}-iso-download'
description: |
This job downloads the latest lts daily desktop iso
Defined in lp:qa-jenkins-jobs
@@ -199,10 +199,10 @@
cron: '@hourly'
polling-node: 'iso-testing'
urls:
- - url: 'http://cdimage.ubuntu.com/{supported-release}/daily-live/pending/.publish_info#iso-download-{variant}-{arch}'
+ - url: 'http://cdimage.ubuntu.com/{supported_release}/daily-live/pending/.publish_info#iso-download-{variant}-{arch}'
check-content:
- text:
- - !j2: '^{{release}}-.*-{{arch | replace("+", "\+") }}.iso .+$'
+ - !j2: '^{{supported_release}}-.*-{{arch | replace("+", "\+") }}.iso .+$'
wrappers:
- timeout:
timeout: 30
@@ -210,7 +210,7 @@
- timestamps
builders:
- download-iso:
- release: '{supported-release}'
+ release: '{supported_release}'
variant: '{variant}'
arch: '{arch}'
flavor: '{flavor}'
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
