Merge pull request #574 from simondeziel/ubuntu-daily

Switch to `ubuntu-daily:` for integration tests inside LXD containers
canonical · Feb 27, 2024 · 4d4b450 · 4d4b450
2 parents 3e40cd3 + 06ab061
commit 4d4b450
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/integration/run-integration-tests b/integration/run-integration-tests
@@ -46,6 +46,10 @@ save_trust_list() {
 OLD_TRUST_LIST="$(mktemp)"
 save_trust_list > "${OLD_TRUST_LIST}"
 
+# Report which LXD version is being tested
+snap list lxd || true
+lxc version
+
 # finally run the integration tests
 tox -e integration
 

diff --git a/integration/run-integration-tests-in-lxd b/integration/run-integration-tests-in-lxd
@@ -14,21 +14,23 @@ DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
 declare -A RELEASE_IMAGES=(
     [focal]="20.04"
     [jammy]="22.04"
+    [noble]="24.04"
 )
 
 function run_tests {
     local target="$1"
     local image="${RELEASE_IMAGES[$target]}"
     local container_name="pylxd-${target}-$$"
-    local container_image="ubuntu:${image}"
+    local container_image="ubuntu-daily:${image}"
     echo "Running ${image} integration tests"
 
     lxc launch --ephemeral "$container_image" "$container_name" -c security.nesting=true
 
     lxc exec "$container_name" -- mkdir -p /opt/pylxd
     { cd "$DIR/.." && git archive --format=tar HEAD; } | lxc exec "$container_name" -- tar -xf - -C /opt/pylxd
 
-    lxc exec "$container_name" -- cloud-init status --long --wait
+    # Workaround https://github.com/canonical/cloud-init/pull/4970
+    lxc exec "$container_name" -- cloud-init status --long --wait || true
     lxc exec "$container_name" --cwd /opt/pylxd -- integration/run-integration-tests
     lxc delete --force "$container_name"
 }