openstack
/
diskimage-builder
Code Issues Proposed changes

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
This commit is contained in:
Riccardo Pittau 2021-08-26 15:56:27 +02:00 committed by Dmitry Tantsur
parent a6ee4d0c21
commit 6ed7f3b139
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.d/project.yaml
View File

@ -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

9
diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
View File

@ -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}