canonical-hw-cert team mailing list archive

[Paul Larson <mp+425895@xxxxxxxxxxxxxxxxxx>]

Paul Larson has proposed merging ~pwlars/hwcert-jenkins-jobs:remove-dawson-i-18 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/425895

image is no longer supported, but we can continue to use dawson-i as a generic nuc for testing on uc20/22 at least
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~pwlars/hwcert-jenkins-jobs:remove-dawson-i-18 into hwcert-jenkins-jobs:master.

diff --git a/jobs/snap-testing/projects/dawson-i.yaml b/jobs/snap-testing/projects/dawson-i.yaml
index 0743442..e08c7e4 100644
--- a/jobs/snap-testing/projects/dawson-i.yaml
+++ b/jobs/snap-testing/projects/dawson-i.yaml
@@ -4,12 +4,12 @@
     arch: amd64
     has-serial-assertion: True
     checkbox_snap: checkbox
-    checkbox_track: uc18
+    checkbox_track: uc20
     launcher: client-cert-iot-ubuntucore
     starting_sleep: 0
     provision_data: |
       provision_data:
-            distro: dawson-uc18-m7-20190122-10
+            distro: core20-latest
     extra_snaps: docker
     checkbox_conf:
       !include-raw-escape: jobs/snap-testing/configs/checkbox.conf
@@ -17,33 +17,7 @@
       !include-raw-escape: jobs/snap-testing/manifests/dawson_i_manifest.conf
     jobs:
       - '{prefix}-{name}-{snap}-{channel}':
-          snap: alsa-utils
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: bluez
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: core18
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: pc
-          track: 18
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: pc-kernel
-          track: 18
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: pulseaudio
-      - '{prefix}-{name}-{snap}-{channel}':
-          snap: snapd
-      - '{prefix}-{name}-{snap}-{track}-{channel}':
-          snap: checkbox  # checkbox-snappy
-          extra_args: --devmode
-          track: uc18
-          checkbox_snap: checkbox
-          checkbox_track: 'uc18'
-      - '{prefix}-{name}-{snap}-{channel}':
           snap: core20
-          checkbox_track: 'uc20'
-          provision_data: |
-            provision_data:
-                  distro: core20-latest
           extra_setup_cmds: |
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
@@ -94,30 +68,18 @@
       - '{prefix}-{name}-{snap}-{track}-{channel}':
           snap: pc
           track: 20
-          checkbox_track: uc20
-          provision_data: |
-            provision_data:
-                  distro: core20-latest-stable
           extra_setup_cmds: |
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
       - '{prefix}-{name}-{snap}-{track}-{channel}':
           snap: pc-kernel
           track: 20
-          checkbox_track: 'uc20'
-          provision_data: |
-            provision_data:
-                  distro: core20-latest-stable
           extra_setup_cmds: |
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
       - '{prefix}-{name}-{snap}-{channel}':
           name: dawson-i-uc20
           snap: snapd
-          checkbox_track: 'uc20'
-          provision_data: |
-            provision_data:
-                  distro: core20-latest-stable
           extra_setup_cmds: |
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
@@ -125,16 +87,8 @@
       - '{prefix}-{name}-{snap}-{track}-{channel}':
           snap: bluez
           track: 20
-          checkbox_track: 'uc20'
-          provision_data: |
-            provision_data:
-                  distro: core20-latest
       - '{prefix}-{name}-{snap}-{channel}':
           snap: checkbox20
-          provision_data: |
-            provision_data:
-                  distro: core20-latest
-          checkbox_track: uc20
           checkbox_channel: beta
           extra_setup_cmds: |
             declare -A extra_snaps_channels
@@ -143,10 +97,6 @@
           snap: checkbox20
           channel: edge
           checkbox_channel: beta
-          provision_data: |
-            provision_data:
-                  distro: core20-latest
-          checkbox_track: uc20
           extra_setup_cmds: |
             declare -A extra_snaps_channels
                     extra_snaps_channels=( ["bluez"]="20/stable" )
@@ -159,26 +109,19 @@
     arch: amd64
     has-serial-assertion: True
     checkbox_snap: checkbox
-    checkbox_track: uc18
+    checkbox_track: uc20
     launcher: ''
     custom_launcher:
         !include-raw-escape: jobs/snap-testing/launchers/client-cert-iot-ubuntucore-stress-ng
     starting_sleep: 0
     provision_data: |
-      provision_data:
-            distro: dawson-uc18-m7-20190122-10
+            provision_data:
+                  distro: core20-latest
     checkbox_conf:
       !include-raw-escape: jobs/snap-testing/configs/checkbox.conf
     manifest:
       !include-raw-escape: jobs/snap-testing/manifests/dawson_i_manifest.conf
     jobs:
       - '{prefix}-{name}-{snap}-{channel}':
-          snap: checkbox18
-          checkbox_channel: beta
-      - '{prefix}-{name}-{snap}-{channel}':
           snap: checkbox20
-          provision_data: |
-            provision_data:
-                  distro: core20-latest
-          checkbox_track: uc20
           checkbox_channel: beta