From 52569913468b2d9ebfadf49e51e8188b4b986967 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 25 Jun 2024 11:04:36 +1000 Subject: [PATCH] dib-functests: run on bookworm Run dib-functests on bookworm, which should mean that we don't need to pull in the unstable debootstrap (c.f. 7b6247554eaecb22d95e626f44452350cc69645b). This should be good for a while :) (c.f. 1a5c5639205a1ce84719aa999dc7a99a3ead5d37) Change-Id: Ib9240c086eff84e02740d98f02e1846a8a39298d --- .zuul.d/jobs.yaml | 2 +- playbooks/dib-functests/run.yaml | 1 - roles/dib-ensure-debootstrap/README.rst | 2 -- roles/dib-ensure-debootstrap/tasks/main.yaml | 12 ------------ 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 roles/dib-ensure-debootstrap/README.rst delete mode 100644 roles/dib-ensure-debootstrap/tasks/main.yaml diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 9358a4d10..58bcdadbe 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -18,7 +18,7 @@ description: | This is the base set of stable tests parent: dib-functests-base - nodeset: debian-bullseye + nodeset: debian-bookworm vars: dib_functests: - containerfile/jammy-build-succeeds diff --git a/playbooks/dib-functests/run.yaml b/playbooks/dib-functests/run.yaml index 05af88d4e..37fbe80a4 100644 --- a/playbooks/dib-functests/run.yaml +++ b/playbooks/dib-functests/run.yaml @@ -5,6 +5,5 @@ - bindep - dib-setup-gate-mirrors - ensure-podman - - dib-ensure-debootstrap - dib-functests diff --git a/roles/dib-ensure-debootstrap/README.rst b/roles/dib-ensure-debootstrap/README.rst deleted file mode 100644 index b92d280aa..000000000 --- a/roles/dib-ensure-debootstrap/README.rst +++ /dev/null @@ -1,2 +0,0 @@ -Update debootstap from debian unstable. This ensures debootstrap is new -enough to recognize Jammy. diff --git a/roles/dib-ensure-debootstrap/tasks/main.yaml b/roles/dib-ensure-debootstrap/tasks/main.yaml deleted file mode 100644 index 0f30d247c..000000000 --- a/roles/dib-ensure-debootstrap/tasks/main.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- name: Install debootstrap/unstable - # This is shell because doing it with native ansible modules went nowhere - become: yes - shell: | - set -ex - echo "APT::Default-Release: 'stable';" > /etc/apt/apt.conf.d/default-release - # echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list.d/unstable-debian.list - apt-get update - apt-get install -y debootstrap - # Remove the use of unstable as it seems to interfere with other tasks - # rm /etc/apt/sources.list.d/unstable-debian.list - apt-get --assume-yes update