canonical-hw-cert team mailing list archive

[Paul Larson <mp+427230@xxxxxxxxxxxxxxxxxx>]

Paul Larson has proposed merging ~pwlars/hwcert-jenkins-jobs:no-cm3-for-22 into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

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

Based on https://ubuntu.com/download/raspberry-pi we don't even advertise that cm3 should work on any of the newer images. Which is sensible because you can't even buy one now. In fact, not even the cm3+ seems to be reported, but since that one at least has the capacity to work (and still seems to work), I think we can defer the decision about whether to keep it until later
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~pwlars/hwcert-jenkins-jobs:no-cm3-for-22 into hwcert-jenkins-jobs:master.

diff --git a/jobs/image-testing/projects/cm3-server.yaml b/jobs/image-testing/projects/cm3-server.yaml
index 600a963..40dc7d3 100644
--- a/jobs/image-testing/projects/cm3-server.yaml
+++ b/jobs/image-testing/projects/cm3-server.yaml
@@ -30,31 +30,3 @@
           image_file: focal-preinstalled-server-armhf+raspi.img.xz
           image_channel: focal
           escaped_image_file: focal-preinstalled-server-armhf\+raspi\.img\.xz
-      - '{prefix}-{device}-{image-type}-server-{arch}-image':
-          image-type: jammy
-          arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/jammy/daily-preinstalled/pending/
-          image_file: jammy-preinstalled-server-arm64+raspi.img.xz
-          image_channel: jammy
-          escaped_image_file: jammy-preinstalled-server-arm64\+raspi\.img\.xz
-      - '{prefix}-{device}-{image-type}-server-{arch}-image':
-          image-type: jammy
-          arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/ubuntu-server/jammy/daily-preinstalled/pending/
-          image_file: jammy-preinstalled-server-armhf+raspi.img.xz
-          image_channel: jammy
-          escaped_image_file: jammy-preinstalled-server-armhf\+raspi\.img\.xz
-      - '{prefix}-{device}-{image-type}-server-{arch}-image':
-          image-type: kinetic
-          arch: arm64
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
-          image_file: kinetic-preinstalled-server-arm64+raspi.img.xz
-          image_channel: kinetic
-          escaped_image_file: kinetic-preinstalled-server-arm64\+raspi\.img\.xz
-      - '{prefix}-{device}-{image-type}-server-{arch}-image':
-          image-type: kinetic
-          arch: armhf
-          image_base_url: http://cdimage.ubuntu.com/daily-preinstalled/pending/
-          image_file: kinetic-preinstalled-server-armhf+raspi.img.xz
-          image_channel: kinetic
-          escaped_image_file: kinetic-preinstalled-server-armhf\+raspi\.img\.xz
diff --git a/jobs/image-testing/projects/cm3.yaml b/jobs/image-testing/projects/cm3.yaml
index 62b3b4c..0a02de1 100644
--- a/jobs/image-testing/projects/cm3.yaml
+++ b/jobs/image-testing/projects/cm3.yaml
@@ -134,27 +134,3 @@
           extra_snaps: checkbox18
           checkbox_snap: checkbox
           checkbox_args: --channel=uc18/stable --devmode
-      - '{prefix}-{device}-{image-type}-image':
-          image-type: core22-armhf
-          image_base_url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending
-          image_file: ubuntu-core-22-armhf+raspi.img.xz
-          image_channel: stable
-          escaped_image_file: ubuntu-core-22-armhf\+raspi\.img\.xz
-          extra_snaps: checkbox22 bluez pi-bluetooth
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-          checkbox_snap: checkbox
-          checkbox_args: --channel=uc22/stable --devmode
-      - '{prefix}-{device}-{image-type}-image':
-          image-type: core22-arm64
-          image_base_url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending
-          image_file: ubuntu-core-22-arm64+raspi.img.xz
-          image_channel: stable
-          escaped_image_file: ubuntu-core-22-arm64\+raspi\.img\.xz
-          extra_snaps: checkbox22 bluez pi-bluetooth
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-          checkbox_snap: checkbox
-          checkbox_args: --channel=uc22/stable --devmode
diff --git a/jobs/snap-testing/projects/cm3-arm64.yaml b/jobs/snap-testing/projects/cm3-arm64.yaml
index b93ea2e..9160e10 100644
--- a/jobs/snap-testing/projects/cm3-arm64.yaml
+++ b/jobs/snap-testing/projects/cm3-arm64.yaml
@@ -81,46 +81,6 @@
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
       - '{prefix}-{name}-{snap}-{channel}':
-          snap: core22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-arm64+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-      - '{prefix}-{name}-{snap}-{channel}':
-          name: cm3-arm64-uc22
-          snap: snapd
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-arm64+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-          influx_reporting: True
-      - '{prefix}-{name}-{snap}-{track}-{channel}':
-          snap: pi
-          track: 22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-arm64+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-      - '{prefix}-{name}-{snap}-{track}-{channel}':
-          snap: pi-kernel
-          track: 22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-arm64+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-      - '{prefix}-{name}-{snap}-{channel}':
           name: cm3-arm64-uc20
           snap: snapd
           checkbox_track: 'uc20'
@@ -169,13 +129,3 @@
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
           checkbox_channel: beta
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: checkbox22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-arm64+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-          checkbox_channel: beta
diff --git a/jobs/snap-testing/projects/cm3-armhf.yaml b/jobs/snap-testing/projects/cm3-armhf.yaml
index cb19304..bca6b88 100644
--- a/jobs/snap-testing/projects/cm3-armhf.yaml
+++ b/jobs/snap-testing/projects/cm3-armhf.yaml
@@ -84,46 +84,6 @@
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
       - '{prefix}-{name}-{snap}-{channel}':
-          snap: core22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-armhf+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-      - '{prefix}-{name}-{snap}-{channel}':
-          name: cm3-armhf-uc22
-          snap: snapd
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-armhf+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-          influx_reporting: True
-      - '{prefix}-{name}-{snap}-{track}-{channel}':
-          snap: pi
-          track: 22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-armhf+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-      - '{prefix}-{name}-{snap}-{track}-{channel}':
-          snap: pi-kernel
-          track: 22
-          checkbox_track: 'uc22'
-          provision_data: |
-            provision_data:
-                  url: http://cdimage.ubuntu.com/ubuntu-core/22/dangerous-stable/pending/ubuntu-core-22-armhf+raspi.img.xz
-          extra_setup_cmds: |
-            declare -A extra_snaps_channels
-                    extra_snaps_channels=( ["bluez"]="22/stable" )
-      - '{prefix}-{name}-{snap}-{channel}':
           name: cm3-armhf-uc20
           snap: snapd
           checkbox_track: 'uc20'