From 35b8ee1f6357c61dd54466efaf41151364a4e040 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 4 Jul 2024 12:41:40 -0400 Subject: [PATCH 1/2] bin/test-image: avoid repeating message Signed-off-by: Simon Deziel --- bin/test-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/test-image b/bin/test-image index c94eab366..f6e5fbddd 100755 --- a/bin/test-image +++ b/bin/test-image @@ -270,8 +270,8 @@ done # Check that cloud variants can be rebooted cleanly. if [ "${VARIANT}" = "cloud" ]; then + echo "==> Performing post cloud-init reboot test" for name in ${INSTANCES}; do - echo "==> Performing post cloud-init reboot test" lxc exec "${name}" -- cloud-init status --wait --long # If systemd is available, use it to wait for any other job to complete before the restart From 116789d7238905f18c4e467201167c5c7ca51ad7 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 4 Jul 2024 12:46:02 -0400 Subject: [PATCH 2/2] github: prevent accidental usage of `images:` in CI test jobs All tests should be done using officially supported images Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3715de7e0..9fac19f60 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -214,6 +214,11 @@ jobs: - name: ${{ matrix.test }} (${{ matrix.track }}) run: | set -eux + + # XXX: prevent accidental usage of `images:` in CI test jobs. + # All tests should be done using officially supported images. + echo '127.0.0.1 images.lxd.canonical.com' | sudo tee /etc/hosts + TEST_SCRIPT="$(echo ${{ matrix.test }} | cut -d " " -f 1)" EXTRA_ARGS="$(echo ${{ matrix.test }} | cut -d " " -f 2- --only-delimited)" if [ "${TEST_SCRIPT}" = "cluster" ]; then