canonical-hw-cert team mailing list archive

[Jonathan Cave <mp+436467@xxxxxxxxxxxxxxxxxx>]

Jonathan Cave has proposed merging ~jocave/hwcert-jenkins-jobs:rpi-change-testplan 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/436467

When I added the jobs for kernel deb testing on RPi devices for kinetic it bothered me that the normal SRU plan was being used and hence certain devices where not being tested at all. Hence, I felt I needed to modify the jobs to use the IoT plans and make sure reasonable manifests were being used.

I tested the results by deploying some with a "joc-" prefix and reviewing the summaries. I believe on all devices more tests are run and pass with few to no fails (~cm4l wifi ac etc which we know has issues in the lab)/


-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~jocave/hwcert-jenkins-jobs:rpi-change-testplan into hwcert-jenkins-jobs:master.

diff --git a/jobs/snap-testing/manifests/cm3_manifest.conf b/jobs/snap-testing/manifests/cm3_manifest.conf
new file mode 100644
index 0000000..fb2562f
--- /dev/null
+++ b/jobs/snap-testing/manifests/cm3_manifest.conf
@@ -0,0 +1,6 @@
+# keep formatting
+        [manifest]
+        com.canonical.certification::has_audio_playback = true
+        com.canonical.certification::has_ethernet_adapter = true
+        com.canonical.certification::gpio_loopback = false
+        com.canonical.certification::has_wlan_adapter = false
\ No newline at end of file
diff --git a/jobs/snap-testing/manifests/rpi2_manifest.conf b/jobs/snap-testing/manifests/rpi2_manifest.conf
new file mode 100644
index 0000000..b2b0dec
--- /dev/null
+++ b/jobs/snap-testing/manifests/rpi2_manifest.conf
@@ -0,0 +1,7 @@
+# keep formatting
+        [manifest]
+        com.canonical.certification::has_audio_playback = true
+        com.canonical.certification::has_ethernet_adapter = true
+        com.canonical.certification::gpio_loopback = true
+        com.canonical.certification::has_usb_storage = true
+        com.canonical.certification::has_wlan_adapter = false
diff --git a/jobs/snap-testing/manifests/rpi3aplus_manifest.conf b/jobs/snap-testing/manifests/rpi3aplus_manifest.conf
new file mode 100644
index 0000000..929b5d2
--- /dev/null
+++ b/jobs/snap-testing/manifests/rpi3aplus_manifest.conf
@@ -0,0 +1,8 @@
+# keep formatting
+        [manifest]
+        com.canonical.certification::has_audio_playback = true
+        com.canonical.certification::has_bt_adapter = true
+        com.canonical.certification::has_ethernet_adapter = true
+        com.canonical.certification::gpio_loopback = true
+        com.canonical.certification::has_usb_storage = true
+        com.canonical.certification::has_wlan_adapter = true
diff --git a/jobs/snap-testing/projects/cm3-arm64.yaml b/jobs/snap-testing/projects/cm3-arm64.yaml
index b93ea2e..5835236 100644
--- a/jobs/snap-testing/projects/cm3-arm64.yaml
+++ b/jobs/snap-testing/projects/cm3-arm64.yaml
@@ -6,12 +6,8 @@
     checkbox_track: 'uc16'
     launcher: client-cert-iot-ubuntucore
     starting_sleep: 200
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = false
-              com.canonical.certification::has_wlan_adapter = false
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
     extra_setup_cmds: |
       declare -A extra_snaps_channels
               extra_snaps_channels=( ["bluez"]="latest/stable" )
diff --git a/jobs/snap-testing/projects/cm3-armhf.yaml b/jobs/snap-testing/projects/cm3-armhf.yaml
index cb19304..9e9ea33 100644
--- a/jobs/snap-testing/projects/cm3-armhf.yaml
+++ b/jobs/snap-testing/projects/cm3-armhf.yaml
@@ -9,12 +9,8 @@
     provision_data: |
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/16/stable/current/ubuntu-core-16-cm3.img.xz
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = false
-              com.canonical.certification::has_wlan_adapter = false
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
     extra_setup_cmds: |
       declare -A extra_snaps_channels
               extra_snaps_channels=( ["bluez"]="latest/stable" )
diff --git a/jobs/snap-testing/projects/cm3p-arm64.yaml b/jobs/snap-testing/projects/cm3p-arm64.yaml
index eed8f29..ed6958e 100644
--- a/jobs/snap-testing/projects/cm3p-arm64.yaml
+++ b/jobs/snap-testing/projects/cm3p-arm64.yaml
@@ -6,12 +6,8 @@
     checkbox_track: 'uc16'
     launcher: client-cert-iot-ubuntucore
     starting_sleep: 200
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = false
-              com.canonical.certification::has_wlan_adapter = false
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
     extra_setup_cmds: |
       declare -A extra_snaps_channels
               extra_snaps_channels=( ["bluez"]="latest/stable" )
diff --git a/jobs/snap-testing/projects/cm3p-armhf.yaml b/jobs/snap-testing/projects/cm3p-armhf.yaml
index 3032e8f..784c4a8 100644
--- a/jobs/snap-testing/projects/cm3p-armhf.yaml
+++ b/jobs/snap-testing/projects/cm3p-armhf.yaml
@@ -9,12 +9,8 @@
     provision_data: |
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/16/stable/current/ubuntu-core-16-cm3.img.xz
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = false
-              com.canonical.certification::has_wlan_adapter = false
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
     extra_setup_cmds: |
       declare -A extra_snaps_channels
               extra_snaps_channels=( ["bluez"]="latest/stable" )
diff --git a/jobs/snap-testing/projects/rpi2.yaml b/jobs/snap-testing/projects/rpi2.yaml
index da53580..cefba31 100644
--- a/jobs/snap-testing/projects/rpi2.yaml
+++ b/jobs/snap-testing/projects/rpi2.yaml
@@ -14,13 +14,8 @@
     extra_snaps: docker
     checkbox_conf:
       !include-raw-escape: jobs/snap-testing/configs/checkbox.conf.rpi2
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = true
-              com.canonical.certification::has_usb_storage = true
-              com.canonical.certification::has_wlan_adapter = false
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/rpi2_manifest.conf
     jobs:
       - '{prefix}-{name}-{snap}-{channel}':
           snap: docker
diff --git a/jobs/snap-testing/projects/rpi3aplus-arm64.yaml b/jobs/snap-testing/projects/rpi3aplus-arm64.yaml
index 95e9d1d..cbf7b57 100644
--- a/jobs/snap-testing/projects/rpi3aplus-arm64.yaml
+++ b/jobs/snap-testing/projects/rpi3aplus-arm64.yaml
@@ -15,14 +15,8 @@
     provision_data: |
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+raspi3.img.xz
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_bt_adapter = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = true
-              com.canonical.certification::has_usb_storage = true
-              com.canonical.certification::has_wlan_adapter = true
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
     jobs:
       - '{prefix}-{name}-{snap}-{channel}':
           snap: bluez
diff --git a/jobs/snap-testing/projects/rpi3aplus-armhf.yaml b/jobs/snap-testing/projects/rpi3aplus-armhf.yaml
index b0f92cd..caf4e94 100644
--- a/jobs/snap-testing/projects/rpi3aplus-armhf.yaml
+++ b/jobs/snap-testing/projects/rpi3aplus-armhf.yaml
@@ -14,14 +14,8 @@
     provision_data: |
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/16/stable/ubuntu-core-16-pi3.img.xz
-    manifest: >-
-      [manifest]
-              com.canonical.certification::has_audio_playback = true
-              com.canonical.certification::has_bt_adapter = true
-              com.canonical.certification::has_ethernet_adapter = true
-              com.canonical.certification::gpio_loopback = true
-              com.canonical.certification::has_usb_storage = true
-              com.canonical.certification::has_wlan_adapter = true
+    manifest:
+      !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
     jobs:
       - '{prefix}-{name}-{snap}-{track}-{channel}':
           snap: checkbox  # checkbox-snappy
diff --git a/jobs/sru/checkbox.conf b/jobs/sru/checkbox.conf
index 2607321..026e5b9 100644
--- a/jobs/sru/checkbox.conf
+++ b/jobs/sru/checkbox.conf
@@ -20,3 +20,4 @@
         STRESS_NG_DISK_TIME = 15
         STRESS_NG_CPU_TIME = 60
         PTS_CACHE_URL = http://10.102.196.9/sru/phoronix_cache/
+        SNAPD_TASK_TIMEOUT = 120
diff --git a/jobs/sru/projects/rpi/focal.yaml b/jobs/sru/projects/rpi/focal.yaml
index 592a83e..c535c82 100644
--- a/jobs/sru/projects/rpi/focal.yaml
+++ b/jobs/sru/projects/rpi/focal.yaml
@@ -11,6 +11,7 @@
     kernel-to-check: linux-raspi
     repository: universe
     testplan: checkbox-launcher-sru-no-stress
+    checkbox_testplan: com.canonical.certification::client-cert-iot-server-20-04-automated
     results_email: True
     provision_data: |
         provision_data:
@@ -18,34 +19,59 @@
     queue: cert-{system-id}
     test_cmds_pre_upgrade_actions_device: |
         _run sudo apt-get remove -y needrestart
-    exclude_test: .*poweroff.* .*reboot.* .*miscellanea/debsums
+    exclude_test: .*poweroff.* .*reboot.* com.canonical.certification::networking/predictable_names
     jobs:
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3
             queue: cm3
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3p
             queue: cm3p
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3ap
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3b
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3bp
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3bplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi400
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi400_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b1g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b1g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b2g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b2g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b4g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b4g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b8g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b8g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpicm4l
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm4l_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpiz2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
+
 - project:
     name: raspi-classic-server-armhf-focal
     srutype: raspi
@@ -59,6 +85,7 @@
     kernel-to-check: linux-raspi
     repository: universe
     testplan: checkbox-launcher-sru-no-stress
+    checkbox_testplan: com.canonical.certification::client-cert-iot-server-20-04-automated
     results_email: True
     provision_data: |
         provision_data:
@@ -66,33 +93,59 @@
     queue: cert-{system-id}
     test_cmds_pre_upgrade_actions_device: |
         _run sudo apt-get remove -y needrestart
-    exclude_test: .*poweroff.* .*reboot.*
+    exclude_test: .*poweroff.* .*reboot.* com.canonical.certification::networking/predictable_names
     jobs:
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3
             queue: cm3
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3p
             queue: cm3p
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi2_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3ap
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3b
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3bp
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3bplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi400
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi400_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b1g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b1g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b2g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b2g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b4g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b4g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b8g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b8g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpicm4l
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm4l_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpiz2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
diff --git a/jobs/sru/projects/rpi/jammy.yaml b/jobs/sru/projects/rpi/jammy.yaml
index 37aa167..bed3921 100644
--- a/jobs/sru/projects/rpi/jammy.yaml
+++ b/jobs/sru/projects/rpi/jammy.yaml
@@ -11,6 +11,7 @@
     kernel-to-check: linux-raspi
     repository: universe
     testplan: checkbox-launcher-sru-no-stress
+    checkbox_testplan: com.canonical.certification::client-cert-iot-server-22-04-automated
     results_email: True
     provision_data: |
         provision_data:
@@ -18,34 +19,59 @@
     queue: cert-{system-id}
     test_cmds_pre_upgrade_actions_device: |
         _run sudo apt-get remove -y needrestart
-    exclude_test: .*poweroff.* .*reboot.* .*miscellanea/debsums
+    exclude_test: .*poweroff.* .*reboot.* com.canonical.certification::networking/predictable_names
     jobs:
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3
             queue: cm3
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3p
             queue: cm3p
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3ap
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3b
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3bp
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3bplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi400
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi400_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b1g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b1g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b2g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b2g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b4g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b4g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b8g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b8g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpicm4l
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm4l_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpiz2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
+
 - project:
     name: raspi-classic-server-armhf-jammy
     srutype: raspi
@@ -59,6 +85,7 @@
     kernel-to-check: linux-raspi
     repository: universe
     testplan: checkbox-launcher-sru-no-stress
+    checkbox_testplan: com.canonical.certification::client-cert-iot-server-22-04-automated
     results_email: True
     provision_data: |
         provision_data:
@@ -66,33 +93,59 @@
     queue: cert-{system-id}
     test_cmds_pre_upgrade_actions_device: |
         _run sudo apt-get remove -y needrestart
-    exclude_test: .*poweroff.* .*reboot.*
+    exclude_test: .*poweroff.* .*reboot.* com.canonical.certification::networking/predictable_names
     jobs:
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3
             queue: cm3
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3p
             queue: cm3p
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi2_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3ap
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3b
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3bp
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3bplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi400
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi400_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b1g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b1g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b2g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b2g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b4g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b4g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b8g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b8g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpicm4l
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm4l_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpiz2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
diff --git a/jobs/sru/projects/rpi/kinetic.yaml b/jobs/sru/projects/rpi/kinetic.yaml
index 74168ca..efdec9a 100644
--- a/jobs/sru/projects/rpi/kinetic.yaml
+++ b/jobs/sru/projects/rpi/kinetic.yaml
@@ -12,6 +12,7 @@
     kernel-to-check: linux-raspi
     repository: main
     testplan: checkbox-launcher-sru-no-stress
+    checkbox_testplan: com.canonical.certification::client-cert-iot-server-22-04-automated
     results_email: True
     provision_data: |
         provision_data:
@@ -19,33 +20,59 @@
     queue: cert-{system-id}
     test_cmds_pre_upgrade_actions_device: |
         _run sudo apt-get remove -y needrestart
-    exclude_test: .*poweroff.* .*reboot.*
+    exclude_test: .*poweroff.* .*reboot.* com.canonical.certification::networking/predictable_names
     jobs:
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3
             queue: cm3
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3p
             queue: cm3p
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3ap
-            exclude_test: .*usb/storage-preinserted .*power-management/poweroff.* .*power-management/reboot.*
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3b
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3bp
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3bplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi400
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi400_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b1g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b1g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b2g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b2g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b4g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b4g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b8g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b8g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpicm4l
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm4l_manifest.conf
+        - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+            system-id: rpiz2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
+
 - project:
     name: raspi-classic-server-armhf-kinetic
     srutype: raspi
@@ -60,6 +87,7 @@
     kernel-to-check: linux-raspi
     repository: main
     testplan: checkbox-launcher-sru-no-stress
+    checkbox_testplan: com.canonical.certification::client-cert-iot-server-22-04-automated
     results_email: True
     provision_data: |
         provision_data:
@@ -67,32 +95,59 @@
     queue: cert-{system-id}
     test_cmds_pre_upgrade_actions_device: |
         _run sudo apt-get remove -y needrestart
-    exclude_test: .*poweroff.* .*reboot.*
+    exclude_test: .*poweroff.* .*reboot.* com.canonical.certification::networking/predictable_names
     jobs:
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3
             queue: cm3
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: cm3p
             queue: cm3p
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi2_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3ap
-            exclude_test: .*usb/storage-preinserted .*power-management/poweroff.* .*power-management/reboot.*
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3aplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3b
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi3bp
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3bplus_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi400
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi400_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b1g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b1g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b2g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b2g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b4g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b4g_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
             system-id: rpi4b8g
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi4b8g_manifest.conf
+        - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+            system-id: rpicm4l
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/cm4l_manifest.conf
         - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
-            system-id: rpicm4l
\ No newline at end of file
+            system-id: rpiz2
+            manifest:
+              !include-raw-escape: jobs/snap-testing/manifests/rpi3_manifest.conf