canonical-hw-cert team mailing list archive

[Jonathan Cave <mp+430743@xxxxxxxxxxxxxxxxxx>]

Jonathan Cave has proposed merging ~jocave/hwcert-jenkins-jobs:odm-smoke-tests-22 into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~jocave/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/430743

ODM test plan smoke tests (diffs between list-bootstrapped output) for 22 series checkbox snaps.

I left some use of the term "cdts" despite switching the snaps over to using "checkbox" to make the changes easier to understand quickly
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~jocave/hwcert-jenkins-jobs:odm-smoke-tests-22 into hwcert-jenkins-jobs:master.

diff --git a/jobs/snap-testing/list-bootstrapped-templates.yaml b/jobs/snap-testing/list-bootstrapped-templates.yaml
index 27a50e9..a1c7f13 100644
--- a/jobs/snap-testing/list-bootstrapped-templates.yaml
+++ b/jobs/snap-testing/list-bootstrapped-templates.yaml
@@ -93,6 +93,14 @@
           provision_data: |
             provision_data:
                   distro: dawson-uc18-m7-20190122-10
+      - 'cert-cdts-smoke-{snap}-{channel}-{image}-{queue}':
+          snap: checkbox22
+          image: 'ubuntucore'
+          cdts_channel: 'uc22/stable'
+          cdts_args: '--devmode'
+          provision_data: |
+            provision_data:
+                  distro: core22-latest
 
 - project:
     name: cdts-smoke-dearest-team
@@ -118,6 +126,20 @@
                   distro: desktop-18-04-1-curtinator-uefi
 
 - project:
+    name: cdts-smoke-g3-3590-c3
+    queue: 201906-27109
+    provision_data: |
+      provision_data:
+            distro: desktop-22-04-uefi
+    jobs:
+      - 'cert-cdts-smoke-{snap}-{channel}-{image}-{queue}':
+          snap: checkbox22
+          image: 'desktop'
+          cdts_channel: 'latest/stable'
+          cdts_args: '--classic'
+          cdts_testplan: 'com.canonical.certification::client-cert-odm-desktop-22-04'
+
+- project:
     name: cdts-smoke-rpi4b8g
     queue: cert-rpi4b8g
     arch: arm64
@@ -132,6 +154,15 @@
           cdts_channel: '20.04/stable'
           cdts_args: '--classic'
           cdts_testplan: 'com.canonical.certification::client-cert-odm-server-20-04'
+      - 'cert-cdts-smoke-{snap}-{channel}-{image}-{queue}':
+          snap: checkbox22
+          image: 'server'
+          cdts_channel: '22.04/stable'
+          cdts_args: '--classic'
+          cdts_testplan: 'com.canonical.certification::client-cert-odm-server-22-04'
+          provision_data: |
+            provision_data:
+                  url: https://cdimage.ubuntu.com/ubuntu-server/jammy/daily-preinstalled/current/jammy-preinstalled-server-arm64+raspi.img.xz
 
 - project:
     name: cdts-smoke-rpi3
diff --git a/jobs/snap-testing/run-cdts-list-bootstrapped.sh b/jobs/snap-testing/run-cdts-list-bootstrapped.sh
index c510868..35a5f8a 100644
--- a/jobs/snap-testing/run-cdts-list-bootstrapped.sh
+++ b/jobs/snap-testing/run-cdts-list-bootstrapped.sh
@@ -100,26 +100,28 @@ cat > job.yaml <<EOF
 
         # ensure any old checkboxen are removed
         _run sudo snap remove cdts
+        _run sudo snap remove checkbox
+        _run sudo snap remove checkbox22
         _run sudo snap remove checkbox20
         _run sudo snap remove checkbox18
-        _run sudo snap remove checkbox
+        _run sudo snap remove checkbox16
 
         _run_retry sudo snap refresh
         wait_for_snap_complete
 
-        # install the stable CDTS and stable checkbox core snap
+        # install the stable checkbox and stable checkbox core snap
         _run_retry sudo snap install {snap}
         wait_for_snap_complete
-        _run_retry sudo snap install cdts --no-wait --channel={cdts_channel} {cdts_args}
+        _run_retry sudo snap install checkbox --no-wait --channel={cdts_channel} {cdts_args}
         wait_for_snap_complete
 
-        # This is needed so that the ~/snap/cdts/current link will exist
-        _run /snap/bin/cdts.checkbox-cli --help &> /dev/null
+        # This is needed so that the ~/snap/checkbox/current link will exist
+        _run /snap/bin/checkbox.checkbox-cli --help &> /dev/null
 
         mkdir -p artifacts
 
         # establish the baseline test plan contents
-        _run /snap/bin/cdts.checkbox-cli list-bootstrapped {cdts_testplan} | sort > stable-list-bootstrapped.txt
+        _run /snap/bin/checkbox.checkbox-cli list-bootstrapped {cdts_testplan} | sort > stable-list-bootstrapped.txt
         if [ \$? -ne 0 ]; then
             echo "ERROR: list-bootstrapped command failed"
             EXITCODE=1
@@ -154,7 +156,7 @@ cat > job.yaml <<EOF
         _run sudo snap set system refresh.hold=\$(date --date="+ 2 day" +%Y-%m-%dT%H:%M:%S%:z)
 
         # get a list of jobs to compare against previous version
-        _run /snap/bin/cdts.checkbox-cli list-bootstrapped {cdts_testplan} | sort > new-list-bootstrapped.txt
+        _run /snap/bin/checkbox.checkbox-cli list-bootstrapped {cdts_testplan} | sort > new-list-bootstrapped.txt
         if [ \$? -ne 0 ]; then
             echo "ERROR: list-bootstrapped command failed"
             EXITCODE=1