Make it easier to test */candidate snap tracks (#351)

canonical · Nov 14, 2024 · 7f893a8 · 7f893a8
2 parents e033d16 + 72c95f1
commit 7f893a8
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -119,6 +119,43 @@ jobs:
             os: 24.04
         exclude:
           # not compatible with 4.0/*
+          - test: container-copy
+            track: "4.0/candidate"
+          - test: conversion
+            track: "4.0/candidate"
+          - test: cpu-vm
+            track: "4.0/candidate"
+          - test: devlxd-vm
+            track: "4.0/candidate"
+          - test: efi-vars-editor-vm
+            track: "4.0/candidate"
+          - test: network-bridge-firewall
+            track: "4.0/candidate"
+            os: 20.04
+          - test: network-ovn
+            track: "4.0/candidate"
+          - test: storage-buckets
+            track: "4.0/candidate"
+          - test: storage-disks-vm
+            track: "4.0/candidate"
+          - test: storage-vm btrfs
+            track: "4.0/candidate"
+          - test: storage-vm ceph
+            track: "4.0/candidate"
+          - test: storage-vm dir
+            track: "4.0/candidate"
+          - test: storage-vm lvm
+            track: "4.0/candidate"
+          - test: storage-vm lvm-thin
+            track: "4.0/candidate"
+          - test: storage-vm zfs
+            track: "4.0/candidate"
+          - test: storage-volumes-vm
+            track: "4.0/candidate"
+          - test: tpm-vm
+            track: "4.0/candidate"
+          - test: vm-migration
+            track: "4.0/candidate"
           - test: container-copy
             track: "4.0/edge"
           - test: conversion
@@ -130,8 +167,8 @@ jobs:
           - test: efi-vars-editor-vm
             track: "4.0/edge"
           - test: network-bridge-firewall
-            os: 20.04
             track: "4.0/edge"
+            os: 20.04
           - test: network-ovn
             track: "4.0/edge"
           - test: storage-buckets
@@ -157,23 +194,35 @@ jobs:
           - test: vm-migration
             track: "4.0/edge"
           # not compatible with 5.0/*
+          - test: efi-vars-editor-vm
+            track: "5.0/candidate"
           - test: efi-vars-editor-vm
             track: "5.0/edge"
+          - test: vm-migration
+            track: "5.0/candidate"
           - test: vm-migration
             track: "5.0/edge"
           # skip track/os combinations that are too far appart
-          - track: "4.0/edge"
-            os: 24.04
-          - track: "5.0/edge"
-            os: 24.04
-          - track: "5.0/edge"
-            os: 20.04
-          - track: "5.21/edge"
-            os: 20.04
-          - track: "latest/edge"
-            os: 20.04
-          - track: "latest/edge"
-            os: 22.04
+          - os: 24.04
+            track: "4.0/candidate"
+          - os: 24.04
+            track: "4.0/edge"
+          - os: 24.04
+            track: "5.0/candidate"
+          - os: 24.04
+            track: "5.0/edge"
+          - os: 20.04
+            track: "5.0/candidate"
+          - os: 20.04
+            track: "5.0/edge"
+          - os: 20.04
+            track: "5.21/candidate"
+          - os: 20.04
+            track: "5.21/edge"
+          - os: 20.04
+            track: "latest/candidate"
+          - os: 20.04
+            track: "latest/edge"
 
     steps:
       - name: Performance tuning

diff --git a/tests/devlxd-container b/tests/devlxd-container
@@ -91,7 +91,7 @@ fi
 
 # Below tests for image export rely on an event being emitted on export. This will not be backported to 4.0 or 5.0,
 # so exit the test here.
-if [ "${LXD_SNAP_CHANNEL}" = "4.0/edge" ] || [ "${LXD_SNAP_CHANNEL}" = "5.0/edge" ]; then
+if echo "${LXD_SNAP_CHANNEL}" | grep -E '^([45]\.0)/'; then
   echo "Skipping devlxd image export tests, not supported"
   FAIL=0
   exit

diff --git a/tests/network-ovn b/tests/network-ovn
@@ -1412,7 +1412,17 @@ ovn_peering_tests() {
 
     echo "==> Check that acl rule for ovn ingress has all the expected values"
     ovn_logs="$(lxc network acl show-log ovn1 --project=ovn1)"
-    [ -n "${ovn_logs}" ]
+
+    # XXX: unable to get logs from old OVN .deb from 20.04
+    if [ -z "${ovn_logs}" ]; then
+        . /etc/os-release
+        if [ "${VERSION_ID}" = "20.04" ]; then
+            echo "Ignoring network acl show-log not working on ${VERSION_ID}"
+        else
+            false
+        fi
+    fi
+
     echo "${ovn_logs}" | while IFS= read -r logline; do
       proto=$(echo "$logline" | jq -r '.proto')
       src=$(echo "$logline" | jq -r '.src')