From 6814c46a298edff746a1e5292ce39361cf7798a5 Mon Sep 17 00:00:00 2001 From: Valentin David Date: Mon, 6 May 2024 09:53:16 +0200 Subject: [PATCH] fixup! tests: use ubuntu-image edge on arm --- spread.yaml | 3 ++- tests/lib/prepare.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spread.yaml b/spread.yaml index cfacdb41f36f..91cf88284292 100644 --- a/spread.yaml +++ b/spread.yaml @@ -44,7 +44,8 @@ environment: # a global setting for LXD channel to use in the tests # TODO: Consider reverting to latest/candidate after Snapcraft compatibility with LXD 5.21 extended version string "5.21 LTS" is fixed LXD_SNAP_CHANNEL: "latest/candidate" - UBUNTU_IMAGE_SNAP_CHANNEL: "2/stable" + UBUNTU_OLD_IMAGE_SNAP_CHANNEL: "2/stable" + UBUNTU_IMAGE_SNAP_CHANNEL: "latest/edge" SNAPCRAFT_SNAP_CHANNEL: "latest/candidate" # controls whether ubuntu-image is built using the current snapd tree as a # dependency or the one listed in its go.mod diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh index 96848e1ba0cf..53f5ad0df9d9 100755 --- a/tests/lib/prepare.sh +++ b/tests/lib/prepare.sh @@ -1066,7 +1066,7 @@ setup_reflash_magic() { elif is_test_target_core 16; then # the new ubuntu-image expects mkfs to support -d option, which was not # supported yet by the version of mkfs that shipped with Ubuntu 16.04 - snap install ubuntu-image --channel="$UBUNTU_IMAGE_SNAP_CHANNEL" --classic + snap install ubuntu-image --channel="$OLD_UBUNTU_IMAGE_SNAP_CHANNEL" --classic else # shellcheck source=tests/lib/image.sh . "$TESTSLIB/image.sh"