canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+470627@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/qa-jenkins-jobs:hardware-installer-testing-amendments into qa-jenkins-jobs:master.

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

For more details, see:
https://code.launchpad.net/~andersson123/qa-jenkins-jobs/+git/qa-jenkins-jobs/+merge/470627
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of ~andersson123/qa-jenkins-jobs:hardware-installer-testing-amendments into qa-jenkins-jobs:master.

diff --git a/jobs/hardware-iso-testing/jobs.yaml b/jobs/hardware-iso-testing/jobs.yaml
index 466de48..4b5e8c2 100644
--- a/jobs/hardware-iso-testing/jobs.yaml
+++ b/jobs/hardware-iso-testing/jobs.yaml
@@ -25,11 +25,19 @@
     release:
       - 'noble'
     test-case:
-      - 'end-to-end-test'
-    client-id:
-      - '202210-30739'
+      - 'erase-and-reinstall'
+      - 'entire-disk-with-zfs'
+      - 'entire-disk-with-zfs-plus-encryption'
+      - 'entire-disk-with-installer-update'
+      - 'entire-disk-with-lvm-and-encryption'
+      - 'entire-disk-no-internet'
+      - 'oem-install'
+    dut-id:
+      - '202201-28611'
+      - '202207-30464'
+      - '202203-30106'
     jobs:
-      - 'hardware-{release}-{variant}-installer-{test-case}-{client-id}'
+      - 'hardware-{release}-{variant}-installer-{test-case}-{dut-id}'
 
 # builder stanzas describe reusable build steps
 - builder:
@@ -42,11 +50,17 @@
             python3 -m venv venv
             . venv/bin/activate
             pip3 install -r requirements.txt
-            python3 ./scripts/call_job.py --job-config test-definitions/{release}/{test-case}.json --client-id {client-id} --c3-client-id "${{C3_CLIENT_ID}}" --c3-secret "${{C3_SECRET}}"
+            development_release=$(python3 -c 'from distro_info import UbuntuDistroInfo; udi = UbuntuDistroInfo(); print(udi.devel())')
+            if [ {release} == $development_release ]; then
+                iso_url="https://cdimage.ubuntu.com/daily-live/current";
+            else
+                iso_url="https://cdimage.ubuntu.com/{release}/daily-live/current";
+            fi
+            python3 ./scripts/call_testflinger_job.py --job-config test-definitions/{release}/{test-case}.json --c3-machine-id {dut-id} --iso-url $iso_url
 
 # job templates
 - job-template:
-    name: 'hardware-{release}-{variant}-installer-{test-case}-{client-id}'
+    name: 'hardware-{release}-{variant}-installer-{test-case}-{dut-id}'
     description: |
         Runs a test defined in gh:/canonical/hardware-installer-testing
     node: 'venonat'
@@ -57,22 +71,15 @@
           description: "github branch of hardware-installer-testing from which to run the tests from."
     wrappers:
       - timeout:
-          timeout: 3600
+          timeout: 7200
           fail: true
       - timestamps
-      - credentials-binding:
-          - text:
-              credential-id: C3_CLIENT_ID
-              variable: C3_CLIENT_ID
-          - text:
-              credential-id: C3_SECRET
-              variable: C3_SECRET
     builders:
       - clear-artifacts:
       - run-hardware-installer-test:
           release: '{release}'
           test-case: '{test-case}'
-          client-id: '{client-id}'
+          dut-id: '{dut-id}'
     publishers:
       - archive:
-          artifacts: 'hardware-installer-testing/*.html'
+          artifacts: 'hardware-installer-testing/artifacts/*'