Merge ~paride/qa-jenkins-jobs:desktop-legacy-jobs into qa-jenkins-jobs:master

[Paride Legovini]

Add Lunar desktop-legacy jobs

[Heather Ellsworth (hellsworth)]

lgtm!

review: Approve

diff --git a/jobs/iso-testing/jobs.yaml b/jobs/iso-testing/jobs.yaml
index cd48781..69b01c0 100644
--- a/jobs/iso-testing/jobs.yaml
+++ b/jobs/iso-testing/jobs.yaml
@@ -27,6 +27,7 @@
     name: 'iso-testing'
     flavor: # Additional flavors can be added here
         - 'ubuntu'
+    variant: 'desktop'
     release: # Additional releases can be added here
         - 'focal'
         - 'jammy'
@@ -46,11 +47,37 @@
         - 'oem'
     node: 'iso-testing'
     jobs:
-        - '{flavor}-{dev-release}-desktop-{arch}-iso-download'
-        - '{flavor}-{supported-release}-desktop-{arch}-iso-download'
-        - '{flavor}-{release}-desktop-{arch}-iso-static-validation'
-        - '{flavor}-{release}-desktop-{arch}-smoke-default'
-        - '{flavor}-{release}-desktop-{arch}-smoke-{desktop-test}'
+        - '{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}'
+    desktop-mailto:
+        - '[e-mail]'
+
+- project:
+    name: 'iso-testing-legacy'
+    flavor:
+        - 'ubuntu'
+    variant: 'desktop-legacy'
+    release:
+        - 'lunar'
+    dev-release:
+        - 'lunar'
+    arch:
+        - 'amd64'
+    desktop-test:
+        - 'default_de'
+        - 'health-check'
+        - 'lvm'
+        - 'min_config'
+        - 'oem'
+    node: 'iso-testing'
+    jobs:
+        - '{flavor}-{dev-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}'
     desktop-mailto:
         - '[e-mail]'
 
@@ -61,14 +88,33 @@
         - shell: |
             [ -d  /data/iso/{flavor} ] || mkdir /data/iso/{flavor}
             sleep $DOWNLOAD_SLEEP
-            download-latest-test-iso -r {release} -v {variant} -a {arch} -b pending -i /data/iso -f {flavor}
+
+            if [ "{variant}" = desktop-legacy ]; then
+                # download-latest-test-iso doesn't know about desktop-legacy images, handle them
+                # manually for now. For the future we should drop download-latest-test-iso and
+                # rely on plain rsync or zsync (like the desktop jobs do).
+                cd /data/iso/{flavor}
+                iso="{release}-{variant}-{arch}.iso"
+                zsync -q "http://cdimage.ubuntu.com/daily-legacy/pending/$iso.zsync"
+                # zsync permissiong for the output file are 600, we need 644 for utah
+                chmod 644 "$iso"
+            else
+                download-latest-test-iso -r {release} -v {variant} -a {arch} -b pending -i /data/iso -f {flavor}
+            fi
 
 - builder: # This step runs a specified iso test
     name: run-iso-test
     builders:
         - shell: |
+            # Special case: desktop-legacy has the same test suite of desktop
+            if [ {variant} = desktop-legacy ]; then
+                variant=desktop
+            else
+                variant={variant}
+            fi
+            iso=/var/cache/utah/iso/{release}-{variant}-{arch}.iso
             cd qa-jenkins-jobs
-            ./scripts/iso-testing/run-iso-test.sh --test {test} --release {release} --variant {variant} --arch {arch}
+            ./scripts/iso-testing/run-iso-test.sh --test {test} --release {release} --variant "$variant" --arch {arch} --iso "$iso"
 
 - builder: # This step runs iso static validation
     name: validate-iso
@@ -144,7 +190,7 @@
 # I'm not adding a job for that so it will never accidentally be deployed.
 
 - job-template:
-    name: '{flavor}-{dev-release}-desktop-{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
@@ -158,7 +204,7 @@
             cron: 'H/15 * * * *' # The H allows jenkins to stagger jobs using a hash
             polling-node: 'iso-testing'
             urls:
-                - url: 'http://cdimage.ubuntu.com/{flavor}/daily-live/pending/SHA256SUMS'
+                - url: 'http://cdimage.ubuntu.com/daily-legacy/pending/SHA256SUMS'
                   check-etag: false
                   check-date: true
                   check-content:
@@ -166,12 +212,12 @@
     builders:
         - download-iso:
             release: '{dev-release}'
-            variant: 'desktop'
+            variant: '{variant}'
             arch: '{arch}'
             flavor: '{flavor}'
 
 - job-template:
-    name: '{flavor}-{supported-release}-desktop-{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
@@ -193,29 +239,29 @@
     builders:
         - download-iso:
             release: '{supported-release}'
-            variant: 'desktop'
+            variant: '{variant}'
             arch: '{arch}'
             flavor: '{flavor}'
 
 - job-template:
-    name: '{flavor}-{release}-desktop-{arch}-iso-static-validation'
+    name: '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
     description: |
         This job runs static validation on a desktop iso
         Defined in lp:qa-jenkins-jobs
     node: 'iso-testing'
     triggers:
         - reverse: # Trigger after the download job succeeds
-            jobs: '{flavor}-{release}-desktop-{arch}-iso-download'
+            jobs: '{flavor}-{release}-{variant}-{arch}-iso-download'
             result: 'success'
     builders:
         - validate-iso:
-            iso: '/data/iso/{flavor}/{release}-desktop-{arch}.iso'
+            iso: '/data/iso/{flavor}/{release}-{variant}-{arch}.iso'
             release: '{release}'
             arch: '{arch}'
-            variant: 'desktop'
+            variant: '{variant}'
 
 - job-template:
-    name: '{flavor}-{release}-desktop-{arch}-smoke-default'
+    name: '{flavor}-{release}-{variant}-{arch}-smoke-default'
     description: |
         Run the default iso test on a desktop image
         Defined in lp:qa-jenkins-jobs
@@ -231,23 +277,23 @@
           description: "Launchpad branch of qa-jenkins-jobs from which to pick the scripts from."
     triggers:
         - reverse: # Trigger after static validation succeeds
-            jobs: '{flavor}-{release}-desktop-{arch}-iso-static-validation'
+            jobs: '{flavor}-{release}-{variant}-{arch}-iso-static-validation'
             result: 'success'
     builders:
         - clear-artifacts:
         - echo-media-info:
-            iso: '/var/cache/utah/iso/{release}-desktop-{arch}.iso'
+            iso: '/var/cache/utah/iso/{release}-{variant}-{arch}.iso'
         - git-shallow-clone:
             project-url: '$QA_JENKINS_JOBS_BRANCH'
             project-name: 'qa-jenkins-jobs'
         - run-iso-test:
             release: '{release}'
-            variant: 'desktop'
+            variant: '{variant}'
             arch: '{arch}'
             test: 'default'
         - write-parameters-file:
             release: '{release}'
-            variant: 'desktop'
+            variant: '{variant}'
             arch: '{arch}'
             flavor: '{flavor}'
     publishers:
@@ -257,7 +303,7 @@
         - desktop-notifications
 
 - job-template:
-    name: '{flavor}-{release}-desktop-{arch}-smoke-{desktop-test}'
+    name: '{flavor}-{release}-{variant}-{arch}-smoke-{desktop-test}'
     description: |
         Run other desktop iso tests
         Defined in lp:qa-jenkins-jobs
@@ -273,18 +319,18 @@
           description: "Launchpad branch of qa-jenkins-jobs from which to pick the scripts from."
     triggers:
         - reverse: # Trigger after the default test succeeds
-            jobs: '{flavor}-{release}-desktop-{arch}-smoke-default'
+            jobs: '{flavor}-{release}-{variant}-{arch}-smoke-default'
             result: 'success'
     builders:
         - clear-artifacts:
         - echo-media-info:
-            iso: '/var/cache/utah/iso/{release}-desktop-{arch}.iso'
+            iso: '/var/cache/utah/iso/{release}-{variant}-{arch}.iso'
         - git-shallow-clone:
             project-url: '$QA_JENKINS_JOBS_BRANCH'
             project-name: 'qa-jenkins-jobs'
         - run-iso-test:
             release: '{release}'
-            variant: 'desktop'
+            variant: '{variant}'
             arch: '{arch}'
             test: '{desktop-test}'
     publishers: