From 93f92a9d5d356ec1f55900858041ed765df65e21 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 14 Nov 2024 10:50:21 -0500 Subject: [PATCH 1/4] tests/devlxd-container: exclude all 4.0/* and 5.0/* snap channels, not just edge ones Signed-off-by: Simon Deziel --- tests/devlxd-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/devlxd-container b/tests/devlxd-container index 7e7dd1754..8c83bb7ef 100755 --- 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 From 69efbfefad72beb33d0bde9ed837d46e112a6a27 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 14 Nov 2024 10:58:22 -0500 Subject: [PATCH 2/4] tests/network-ovn: ignore empty `network acl show-log` when on 20.04 Signed-off-by: Simon Deziel --- tests/network-ovn | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/network-ovn b/tests/network-ovn index 7759483ee..11d4c9d8f 100755 --- 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') From f2bcd4b1507ada999f45fe5ebb86c005b5cade43 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 14 Nov 2024 12:05:28 -0500 Subject: [PATCH 3/4] github: start testing latest/edge on 22.04 as that's a recommended base OS Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c42d75c50..d15736b1f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -172,8 +172,6 @@ jobs: os: 20.04 - track: "latest/edge" os: 20.04 - - track: "latest/edge" - os: 22.04 steps: - name: Performance tuning From 72c95f10e811d2b54cf9f110e629d6a91ce827bd Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 14 Nov 2024 12:06:41 -0500 Subject: [PATCH 4/4] github: rework matrix exclusion to also consider candidate tracks Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 73 +++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d15736b1f..b0418bfd0 100644 --- 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,21 +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 + - 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