← Back to team overview

canonical-hw-cert team mailing list archive

[Merge] hwcert-jenkins-jobs:new-triggers into hwcert-jenkins-jobs:master

 

Michał Sawicz has proposed merging hwcert-jenkins-jobs:new-triggers into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~hwcert-jenkins/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/439857
-- 
Your team hwcert-jenkins is requested to review the proposed merge of hwcert-jenkins-jobs:new-triggers into hwcert-jenkins-jobs:master.
diff --git a/jobs/mir/mir-core-template.yaml b/jobs/mir/mir-core-template.yaml
index 67acc26..86466df 100644
--- a/jobs/mir/mir-core-template.yaml
+++ b/jobs/mir/mir-core-template.yaml
@@ -12,8 +12,18 @@
     concurrent: false
     sequential: false
     repository: main
-    architecture: amd64
+    arch: amd64
     has-serial-assertion: True
+    triggers:
+      - pollurl:
+          cron: 'H/10 * * * *'
+          polling-node: 'master'
+          urls:
+            - url: "{jenkins_url}/job/cert-snap-package-data/lastSuccessfulBuild/artifact/snaps.json/*view*/"
+              check-content:
+                - simple: false
+                - json:
+                  - '{snap}.{track}.{channel}.{arch}.revision'
     wrappers:
       - timeout:
           timeout: 400
@@ -41,50 +51,3 @@
           allow-empty: true
       - email:
           recipients: michal.sawicz@xxxxxxxxxxxxx alan.griffiths@xxxxxxxxxxxxx
-
-- job-template:
-    name: '{prefix}-trigger-mir-{suite}-{snap}-{channel}-{device}'
-    description: "This triggers the mir tests on {snap} updates in {channel} on {device}\n"
-    suite: smoke
-    channel: 'beta'
-    properties:
-    - build-discarder:
-        num-to-keep: 10
-    triggers:
-      - timed: '@hourly'
-    builders:
-      - shell: |
-          #!/bin/bash
-          set +e
-          REV_URL="https://testflinger-revcache.canonical.com/v1/rev/$JOB_NAME";
-          if  ! which jq > /dev/null || ! which curl > /dev/null; then
-              echo "Please ensure jq and curl are installed!"
-              exit 1
-          fi
-          TRACK="{track}"
-          TRACK="${{TRACK:-latest}}"
-          REV=$(curl -s -H "Snap-Device-Series: 16" -H "Snap-Device-Store: {store}" "{url}" | jq --arg TRACK "$TRACK" '."channel-map" | .[] | select(.channel.risk=="{channel}") |select(.channel.track==$TRACK).revision')
-          REV_OLD_FILE=$(cat $WORKSPACE/revision.last 2> /dev/null || echo 0)
-          REV_OLD=$(curl -sf $REV_URL)
-          REV_OLD=$(( $REV_OLD > $REV_OLD_FILE ? $REV_OLD : $REV_OLD_FILE ))
-          if [ "$REV" -gt "$REV_OLD" ]; then
-            if ! curl -sf $REV_URL -X POST -d "$REV"; then
-              echo "ERROR: Unable to reach $REV_URL to set latest revision!"
-              exit 1
-            fi
-            echo "Triggering test on revision $REV"
-            exit 0
-          else
-            echo "No newer revision found (last=$REV_OLD), exiting"
-            exit 1
-          fi
-    publishers:
-      - trigger:
-          project: '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
-          threshold: SUCCESS
-
-- job-group:
-    name: '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
-    jobs:
-      - '{prefix}-trigger-mir-{suite}-{snap}-{channel}-{device}'
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/mir-template.yaml b/jobs/mir/mir-template.yaml
index d37eb79..f59532b 100644
--- a/jobs/mir/mir-template.yaml
+++ b/jobs/mir/mir-template.yaml
@@ -16,11 +16,21 @@
     concurrent: false
     sequential: false
     repository: main
-    architecture: amd64
+    arch: amd64
     gschema_override:
       !include-raw-escape: jobs/sru/gschema.override
     wait_script:
       !include-raw-escape: jobs/mir/wait-resource.sh
+    triggers:
+      - pollurl:
+          cron: 'H/10 * * * *'
+          polling-node: 'master'
+          urls:
+            - url: "{jenkins_url}/job/cert-snap-package-data/lastSuccessfulBuild/artifact/snaps.json/*view*/"
+              check-content:
+                - simple: false
+                - json:
+                  - '{snap}.{track}.{channel}.{arch}.revision'
     wrappers:
       - timeout:
           timeout: 400
@@ -48,49 +58,3 @@
           allow-empty: true
       - email:
           recipients: michal.sawicz@xxxxxxxxxxxxx alan.griffiths@xxxxxxxxxxxxx
-
-- job-template:
-    name: '{prefix}-trigger-{series}-mir-{suite}-{snap}-{channel}-{queue}'
-    description: "This triggers the mir tests on {snap} updates in {channel} on {queue}/{series}\n"
-    suite: smoke
-    properties:
-    - build-discarder:
-        num-to-keep: 10
-    triggers:
-      - timed: '@hourly'
-    builders:
-      - shell: |
-          #!/bin/bash
-          set +e
-          REV_URL="https://testflinger-revcache.canonical.com/v1/rev/$JOB_NAME";
-          if  ! which jq > /dev/null || ! which curl > /dev/null; then
-              echo "Please ensure jq and curl are installed!"
-              exit 1
-          fi
-          TRACK="{track}"
-          TRACK="${{TRACK:-latest}}"
-          REV=$(curl -s -H "Snap-Device-Series: 16" -H "Snap-Device-Store: {store}" "{url}" | jq --arg TRACK "$TRACK" '."channel-map" | .[] | select(.channel.risk=="{channel}") |select(.channel.track==$TRACK).revision')
-          REV_OLD_FILE=$(cat $WORKSPACE/revision.last 2> /dev/null || echo 0)
-          REV_OLD=$(curl -sf $REV_URL)
-          REV_OLD=$(( $REV_OLD > $REV_OLD_FILE ? $REV_OLD : $REV_OLD_FILE ))
-          if [ "$REV" -gt "$REV_OLD" ]; then
-            if ! curl -sf $REV_URL -X POST -d "$REV"; then
-              echo "ERROR: Unable to reach $REV_URL to set latest revision!"
-              exit 1
-            fi
-            echo "Triggering test on revision $REV"
-            exit 0
-          else
-            echo "No newer revision found (last=$REV_OLD), exiting"
-            exit 1
-          fi
-    publishers:
-      - trigger:
-          project: '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
-          threshold: SUCCESS
-
-- job-group:
-    name: '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
-    jobs:
-      - '{prefix}-trigger-{series}-mir-{suite}-{snap}-{channel}-{queue}'
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
diff --git a/jobs/mir/projects-mir-core/beta.yaml b/jobs/mir/projects-mir-core/beta.yaml
index 688d795..90aad55 100644
--- a/jobs/mir/projects-mir-core/beta.yaml
+++ b/jobs/mir/projects-mir-core/beta.yaml
@@ -9,7 +9,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-beta-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -21,7 +21,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-beta-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -33,7 +33,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-mesa-core20-beta-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -45,7 +45,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-beta-rpi4-armhf-core20
     device: rpi4-armhf
@@ -57,7 +57,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-armhf+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-beta-rpi4-arm64-core20
     device: rpi4-arm64
@@ -69,7 +69,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-beta-rpi4-arm64-core20
     device: rpi4-arm64
@@ -81,7 +81,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-beta-rpi4-arm64-core20
     device: rpi4-arm64
@@ -93,7 +93,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-mesa-core20-beta-rpi4-arm64-core20
     device: rpi4-arm64
@@ -105,7 +105,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-beta-intel-amd64-core18
     device: intel-amd64
@@ -117,7 +117,7 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-beta-intel-amd64-core18
     device: intel-amd64
@@ -129,7 +129,7 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-beta-intel-amd64-core18
     device: intel-amd64
@@ -141,7 +141,7 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-mesa-core20-beta-intel-amd64-core18
     device: intel-amd64
@@ -153,4 +153,4 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects-mir-core/candidate.yaml b/jobs/mir/projects-mir-core/candidate.yaml
index e4e21e1..ab119f8 100644
--- a/jobs/mir/projects-mir-core/candidate.yaml
+++ b/jobs/mir/projects-mir-core/candidate.yaml
@@ -9,7 +9,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-candidate-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -21,7 +21,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-candidate-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -33,7 +33,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-candidate-rpi4-armhf-core20
     device: rpi4-armhf
@@ -45,7 +45,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-armhf+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-candidate-rpi4-arm64-core20
     device: rpi4-arm64
@@ -57,7 +57,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-candidate-rpi4-arm64-core20
     device: rpi4-arm64
@@ -69,7 +69,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-candidate-rpi4-arm64-core20
     device: rpi4-arm64
@@ -81,4 +81,4 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects-mir-core/dragonboard.yaml b/jobs/mir/projects-mir-core/dragonboard.yaml
index 0a92848..22f49d4 100644
--- a/jobs/mir/projects-mir-core/dragonboard.yaml
+++ b/jobs/mir/projects-mir-core/dragonboard.yaml
@@ -8,7 +8,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+snapdragon.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-dragonboard-snapd
     device: dragonboard
@@ -19,7 +19,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+snapdragon.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-dragonboard-kernel
     device: dragonboard
@@ -31,4 +31,4 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+snapdragon.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects-mir-core/performance.yaml b/jobs/mir/projects-mir-core/performance.yaml
index 807553b..4dd4bfa 100644
--- a/jobs/mir/projects-mir-core/performance.yaml
+++ b/jobs/mir/projects-mir-core/performance.yaml
@@ -10,7 +10,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-performance-rpi4-arm64-core20
     device: rpi4-arm64
@@ -23,7 +23,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-performance-rpi4-arm64-core20
     device: rpi4-arm64
@@ -37,7 +37,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-performance-rpi4-arm64-core20
     device: rpi4-arm64
@@ -51,4 +51,4 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects-mir-core/rpi3.yaml b/jobs/mir/projects-mir-core/rpi3.yaml
index dafe9a7..bb1eb60 100644
--- a/jobs/mir/projects-mir-core/rpi3.yaml
+++ b/jobs/mir/projects-mir-core/rpi3.yaml
@@ -8,7 +8,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-armhf-core18
     device: rpi3b-armhf
@@ -19,7 +19,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-arm64-snapd
     device: rpi3b-arm64
@@ -30,7 +30,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-armhf-snapd
     device: rpi3b-armhf
@@ -41,7 +41,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-arm64-pi-kernel
     device: rpi3b-arm64
@@ -53,7 +53,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-arm64+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-armhf-pi-kernel
     device: rpi3b-armhf
@@ -65,7 +65,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-edge-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -77,7 +77,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-edge-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -89,7 +89,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-edge-rpi3-armhf-core18
     device: rpi3b-armhf
@@ -101,7 +101,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/18/stable/current/ubuntu-core-18-armhf+raspi3.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-arm64-core20
     device: rpi3b-arm64
@@ -112,7 +112,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-rpi3b-armhf-core20
     device: rpi3b-armhf
@@ -123,4 +123,4 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-armhf+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects-mir-core/rpi4.yaml b/jobs/mir/projects-mir-core/rpi4.yaml
index 844b68e..938da63 100644
--- a/jobs/mir/projects-mir-core/rpi4.yaml
+++ b/jobs/mir/projects-mir-core/rpi4.yaml
@@ -9,7 +9,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-armhf+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-edge-rpi4-arm64-core20
     device: rpi4-arm64
@@ -21,7 +21,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-edge-rpi4-arm64-core20
     device: rpi4-arm64
@@ -33,7 +33,7 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-edge-rpi4-arm64-core20
     device: rpi4-arm64
@@ -45,4 +45,4 @@
       provision_data:
             url: http://cdimage.ubuntu.com/ubuntu-core/20/dangerous-stable/current/ubuntu-core-20-arm64+raspi.img.xz
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects-mir-core/x86.yaml b/jobs/mir/projects-mir-core/x86.yaml
index 80d31ec..49c851d 100644
--- a/jobs/mir/projects-mir-core/x86.yaml
+++ b/jobs/mir/projects-mir-core/x86.yaml
@@ -9,7 +9,7 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: mir-kiosk-edge-intel-amd64-core18
     device: intel-amd64
@@ -21,7 +21,7 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
 - project:
     name: ubuntu-frame-edge-intel-amd64-core18
     device: intel-amd64
@@ -33,4 +33,4 @@
       provision_data:
             distro: ubuntu-core-18-amd64
     jobs:
-      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}-group'
+      - '{prefix}-mir-{suite}-{snap}-{channel}-{device}'
diff --git a/jobs/mir/projects/beta.yaml b/jobs/mir/projects/beta.yaml
index eea8745..5a6a7f6 100644
--- a/jobs/mir/projects/beta.yaml
+++ b/jobs/mir/projects/beta.yaml
@@ -6,7 +6,7 @@
     snap: mir-test-tools
     channel: beta
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-kiosk-beta-intel-gfx
     queue: intel-gfx
@@ -15,7 +15,7 @@
     snap: mir-kiosk
     channel: beta
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-beta-nvidia-gfx
     queue: 201405-15065
@@ -28,7 +28,7 @@
         echo 'GRUB_CMDLINE_LINUX_DEFAULT="nvidia-drm.modeset=1"' |sudo tee /etc/default/grub.d/99-nvidia.cfg
                 sudo update-grub
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-ubuntu-frame-beta-intel-gfx
     queue: intel-gfx
@@ -37,7 +37,7 @@
     snap: ubuntu-frame
     channel: beta
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mesa-core20-beta-intel-gfx
     queue: intel-gfx
@@ -46,4 +46,4 @@
     snap: mesa-core20
     channel: beta
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
diff --git a/jobs/mir/projects/candidate.yaml b/jobs/mir/projects/candidate.yaml
index 17df6b5..87c3140 100644
--- a/jobs/mir/projects/candidate.yaml
+++ b/jobs/mir/projects/candidate.yaml
@@ -6,7 +6,7 @@
     snap: mir-test-tools
     channel: candidate
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-kiosk-candidate-intel-gfx
     queue: intel-gfx
@@ -15,7 +15,7 @@
     snap: mir-kiosk
     channel: candidate
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-candidate-nvidia-gfx
     queue: 201405-15065
@@ -28,7 +28,7 @@
         echo 'GRUB_CMDLINE_LINUX_DEFAULT="nvidia-drm.modeset=1"' |sudo tee /etc/default/grub.d/99-nvidia.cfg
                 sudo update-grub
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-ubuntu-frame-candidate-intel-gfx
     queue: intel-gfx
@@ -37,4 +37,4 @@
     snap: ubuntu-frame
     channel: candidate
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
diff --git a/jobs/mir/projects/desktop-performance.yaml b/jobs/mir/projects/desktop-performance.yaml
index afc8e43..fad0652 100644
--- a/jobs/mir/projects/desktop-performance.yaml
+++ b/jobs/mir/projects/desktop-performance.yaml
@@ -7,7 +7,7 @@
     channel: edge
     suite: performance
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-performance-nvidia-gfx
     queue: 201405-15065
@@ -22,7 +22,7 @@
         echo 'GRUB_CMDLINE_LINUX_DEFAULT="nvidia-drm.modeset=1"' |sudo tee /etc/default/grub.d/99-nvidia.cfg
                 sudo update-grub
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-kiosk-performance-intel-gfx
     queue: intel-gfx
@@ -33,7 +33,7 @@
     suite: performance
     filter: Hosted*
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-ubuntu-frame-performance-intel-gfx
     queue: intel-gfx
@@ -44,4 +44,4 @@
     suite: performance
     filter: Hosted*
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
diff --git a/jobs/mir/projects/desktop.yaml b/jobs/mir/projects/desktop.yaml
index f38f749..538a5e0 100644
--- a/jobs/mir/projects/desktop.yaml
+++ b/jobs/mir/projects/desktop.yaml
@@ -6,7 +6,7 @@
     snap: mir-test-tools
     channel: edge
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-edge-nvidia-gfx
     queue: 201405-15065
@@ -19,7 +19,7 @@
         echo 'GRUB_CMDLINE_LINUX_DEFAULT="nvidia-drm.modeset=1"' |sudo tee /etc/default/grub.d/99-nvidia.cfg
                 sudo update-grub
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-edge-intel-gfx
     queue: intel-gfx
@@ -28,7 +28,7 @@
     snap: mir-test-tools
     channel: edge
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-mir-kiosk-edge-intel-gfx
     queue: intel-gfx
@@ -37,7 +37,7 @@
     snap: mir-kiosk
     channel: edge
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
 - project:
     name: focal-ubuntu-frame-edge-intel-gfx
     queue: intel-gfx
@@ -46,4 +46,4 @@
     snap: ubuntu-frame
     channel: edge
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'
diff --git a/jobs/mir/projects/edge.yaml b/jobs/mir/projects/edge.yaml
index 4d4cc8a..f9e8c7e 100644
--- a/jobs/mir/projects/edge.yaml
+++ b/jobs/mir/projects/edge.yaml
@@ -1,10 +1,11 @@
 - project:
     name: jammy-snapd-edge-unmatched-gfx
     queue: unmatched-gfx
+    arch: riscv64
     series: jammy
     image: http://cdimage.ubuntu.com/releases/jammy/release/ubuntu-22.04.2-preinstalled-server-riscv64+unmatched.img.xz
     reboot: "false"
     snap: snapd
     channel: edge
     jobs:
-      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}-group'
+      - '{prefix}-{series}-mir-{suite}-{snap}-{channel}-{queue}'

Follow ups