Merge "Fix debian-minimal security repos"
This commit is contained in:
commit
0aa6e24286
@ -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
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user