canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+468603@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
fix: hardware-iso-testing: fix indentation and some variable inheritance in jobs.yaml

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/468603

I missed some of these issues in a previous MP. The indentation was wrong and some of the variable inheritance wasn't valid.
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of ~andersson123/qa-jenkins-jobs:fix-hardware-testing-jobs into qa-jenkins-jobs:master.

diff --git a/jobs/hardware-iso-testing/jobs.yaml b/jobs/hardware-iso-testing/jobs.yaml
index dbf1844..f89a345 100644
--- a/jobs/hardware-iso-testing/jobs.yaml
+++ b/jobs/hardware-iso-testing/jobs.yaml
@@ -19,17 +19,17 @@
 # The project stanza describes all jobs and parameters
 
 - project:
-  name: 'hardware-iso-testing'
-  variant:
-    - 'desktop'
-  release:
-    - 'noble'
-  test-case:
-    - 'end-to-end-test'
-  client-id:
-    - '202210-30739'
-  jobs:
-    - 'hardware-{release}-{variant}-installer-{test-case}-{client-id}'
+    name: 'hardware-iso-testing'
+    variant:
+      - 'desktop'
+    release:
+      - 'noble'
+    test-case:
+      - 'end-to-end-test'
+    client-id:
+      - '202210-30739'
+    jobs:
+      - 'hardware-{release}-{variant}-installer-{test-case}-{client-id}'
 
 # builder stanzas describe reusable build steps
 - builder:
@@ -38,11 +38,11 @@
       - shell: |
             set -e
             cd hardware-installer-testing/
-            git checkout "${HW_INSTALLER_TESTING_BRANCH}"
+            git checkout {hardware-installer-testing-branch}
             python3 -m venv venv
             source venv/bin/activate
             pip3 install rpyc==5.3.1
-            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}"
+            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}
 
 
 # job templates
@@ -77,6 +77,9 @@
           release: '{release}'
           test-case: '{test-case}'
           client-id: '{client-id}'
+          hardware-installer-testing-branch: '$HW_INSTALLER_TESTING_BRANCH'
+          c3-client-id: '$C3_CLIENT_ID'
+          c3-secret: '$C3_SECRET'
     publishers:
       - archive:
           artifacts: '*.html'