From 6ed7f3b1399e6ad4414445735da118f1cd90fd59 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 26 Aug 2021 15:56:27 +0200 Subject: [PATCH] Fix debian-minimal security repos Debian stable security repos is now stable-security, as well as other versions. Move the Debian bullseye job from experimental to non-voting check. Change-Id: I451cacda6573727de9448b5857bed5181850b4ad --- .zuul.d/project.yaml | 3 ++- .../debian-minimal/environment.d/10-debian-minimal.bash | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index e956e9051..f4c4aaf9d 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -32,6 +32,8 @@ - dib-functests-bionic-python3-extras - dib-functests-bionic-python3-containers - ironic-python-agent-check-image-dib-centos8 + - dib-nodepool-functional-openstack-debian-bullseye-src: + voting: false # IPA job that builds AND validates an image via deployment - ipa-tempest-bios-ipmi-direct-src: voting: false @@ -59,4 +61,3 @@ - dib-nodepool-functional-openstack-gentoo-src - dib-nodepool-functional-openstack-debian-stretch-src - dib-nodepool-functional-openstack-debian-buster-src - - dib-nodepool-functional-openstack-debian-bullseye-src diff --git a/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash index 5ed7c7586..fafb41477 100644 --- a/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash +++ b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash @@ -17,13 +17,16 @@ DIB_DEBIAN_SECURITY_MIRROR=${DIB_DEBIAN_SECURITY_MIRROR:-http://security.debian. export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } -if [ "${DIB_RELEASE}" = "bullseye" ]; then +case "${DIB_RELEASE}" in + bookworm|bullseye|stable|testing) DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}-security" DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-} -else + ;; + *) DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}" DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-/updates} -fi + ;; +esac DIB_APT_SOURCES_CONF_DEFAULT=\ "default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS}