canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+488525@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging qa-jenkins-jobs:tpm-fde-vm-jobs-update 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/488525

Add update TPM FDE vm jobs and tidy up the bash in the jenkins job a little, as well as not running TPM FDE jobs for noble
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of qa-jenkins-jobs:tpm-fde-vm-jobs-update into qa-jenkins-jobs:master.

diff --git a/jobs/robot-framework-iso-testing/jobs.yaml b/jobs/robot-framework-iso-testing/jobs.yaml
index a93b5a6..aff4cd3 100644
--- a/jobs/robot-framework-iso-testing/jobs.yaml
+++ b/jobs/robot-framework-iso-testing/jobs.yaml
@@ -25,7 +25,10 @@
         - 'noble'
         - 'questing'
     test_case:
-        - 'tpm-fde'
+        - 'tpm-fde-not-available'
+        - 'tpm-fde-no-passphrase'
+        - 'tpm-fde-pin-code'
+        - 'tpm-fde-with-passphrase'
         - 'entire-disk'
         - 'entire-disk-with-zfs'
         - 'entire-disk-with-zfs-plus-encryption'
@@ -112,11 +115,18 @@
                 . .venv/bin/activate
                 uv pip install .[develop] -r ../hardware-installer-testing/requirements.txt
                 cd ../hardware-installer-testing
-                if [[ "{test_case}" == "tpm-fde" ]]; then
-                    ./runner/spawn_and_run_test_suite.py --tpm --test-suite robot/test-cases/{release}/{test_case} --iso "$ISO_PATH" --qemu-args-json ./runner/qemu-args.json --cleanup-storage --storage-prefix /srv/data
-                else
-                    ./runner/spawn_and_run_test_suite.py --test-suite robot/test-cases/{release}/{test_case} --iso "$ISO_PATH" --qemu-args-json ./runner/qemu-args.json --cleanup-storage --storage-prefix /srv/data
+                if [[ "{test_case}" == *"tpm-fde"* ]]; then
+                    if [[ "{release}" == "noble" ]]; then
+                        echo "We do not run tpm fde testing for noble at this point in time."
+                        exit 2
+                    fi
+                    extra_arg="--tpm"
+                    if [[ "{test_case}" == "tpm-fde-not-available" ]]; then
+                        extra_arg=""
+                    fi
                 fi
+                ./runner/spawn_and_run_test_suite.py --test-suite robot/test-cases/{release}/{test_case} --iso "$ISO_PATH" --qemu-args-json ./runner/qemu-args.json --cleanup-storage --storage-prefix /srv/data "${extra_arg}"
+            unstable-return: 2
     publishers:
         - archive:
             artifacts: 'hardware-installer-testing/artifacts/*'