canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+490082@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging qa-jenkins-jobs:rf-jobs-revert 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/490082

There's an underlying bug in the `--suite` functionality, so the tests can't be run like this just yet. Reverting since .3 is coming up and I want the tests running properly.
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of qa-jenkins-jobs:rf-jobs-revert into qa-jenkins-jobs:master.

diff --git a/jobs/robot-framework-iso-testing/jobs.yaml b/jobs/robot-framework-iso-testing/jobs.yaml
index ef26bdc..46f80b4 100644
--- a/jobs/robot-framework-iso-testing/jobs.yaml
+++ b/jobs/robot-framework-iso-testing/jobs.yaml
@@ -25,13 +25,14 @@
         - 'noble'
         - 'questing'
     test_case:
-        - "Tpm-Fde-Not-Available"
-        - "Tpm-Fde-No-Passphrase"
-        - "Tpm-Fde-With-Passphrase"
-        - "Entire-Disk"
-        - "Entire-Disk-With-Zfs"
-        - "Entire-Disk-With-Zfs-Plus-Encryption"
-        - "Entire-Disk-With-Lvm-And-Encryption"
+        - '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'
+        - 'entire-disk-with-lvm-and-encryption'
     jobs:
         - 'robot-framework-{release}-desktop-{test_case}'
 
@@ -48,10 +49,6 @@
           name: RF_BRANCH
           default: 'main'
           description: branch of RF to run tests from
-      - string:
-          name: UGT_BRANCH
-          default: 'main'
-          description: branch of UGT to run tests from
     node: 'rf-iso-testing'
     triggers:
         - pollurl:
@@ -113,7 +110,6 @@
                 cache_dir="/srv/data/.rf_image_cache/{release}/"
                 retry -t 3 -d 180 -- git clone -b "$HIT_BRANCH" https://oauth2:"$GH_PAT"@github.com/canonical/hardware-installer-testing.git
                 retry -t 3 -d 180 -- git clone -b "$RF_BRANCH" https://oauth2:"$GH_PAT"@github.com/canonical/yarf.git
-                retry -t 3 -d 180 -- git clone -b "$UGT_BRANCH" https://oauth2:"$GH_PAT"@github.com/canonical/ubuntu-gui-testing.git
                 DEBIAN_FRONTEND=noninteractive sudo apt-get install -y clang libxkbcommon-dev tesseract-ocr
                 ISO_PATH="${{cache_dir}}{release}-desktop-amd64.iso"
                 cd yarf/
@@ -122,20 +118,19 @@
                 uv sync
                 . .venv/bin/activate
                 uv pip install .[develop] -r ../hardware-installer-testing/requirements.txt
-                cd ..
-                series="{release}"
+                cd ../hardware-installer-testing
                 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
-                    if [[ "{test_case}" == "Tpm-Fde-Not-Available" ]]; then
-                        ./hardware-installer-testing/runner/spawn_and_run_test_suite.py --test-suite ubuntu-gui-testing/tests/desktop-installer --iso "$ISO_PATH" --qemu-args-json ./hardware-installer-testing/runner/qemu-args.json --cleanup-storage --storage-prefix /srv/data --suite "${{series^}}.{test_case}"
+                    if [[ "{test_case}" == "tpm-fde-not-available" ]]; then
+                        ./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
                     else
-                        ./hardware-installer-testing/runner/spawn_and_run_test_suite.py --tpm --test-suite ubuntu-gui-testing/tests/desktop-installer --iso "$ISO_PATH" --qemu-args-json ./hardware-installer-testing/runner/qemu-args.json --cleanup-storage --storage-prefix /srv/data --suite "${{series^}}.{test_case}"
+                        ./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 --tpm
                     fi
                 else
-                    ./hardware-installer-testing/runner/spawn_and_run_test_suite.py --test-suite ubuntu-gui-testing/tests/desktop-installer --iso "$ISO_PATH" --qemu-args-json ./hardware-installer-testing/runner/qemu-args.json --cleanup-storage --storage-prefix /srv/data --suite "${{series^}}.{test_case}"
+                    ./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
                 fi
             unstable-return: 2
     publishers: