sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add Debian Bullseye Zuul job"

Browse Source
This commit is contained in:
Zuul 2021-04-12 13:16:23 +00:00 committed by Gerrit Code Review
commit d7becbeb2b
5 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.zuul.d/jobs.yaml
View File

@ -287,6 +287,23 @@
DIB_DISABLE_APT_CLEANUP: '1' DIB_DISABLE_APT_CLEANUP: '1'
DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg' DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
- job:
name: dib-nodepool-functional-openstack-debian-bullseye-src
description: |
Test building and booting a Debian bullseye image with Nodepool
and OpenStack
parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml
vars:
nodepool_diskimage:
base_element: debian-minimal
release: 'bullseye'
mirror: "http://{{ zuul_site_mirror_fqdn }}/debian"
env-vars:
DIB_APT_LOCAL_CACHE: '0'
DIB_DISABLE_APT_CLEANUP: '1'
DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
- job: - job:
name: dib-nodepool-functional-openstack-debian-buster-src name: dib-nodepool-functional-openstack-debian-buster-src
description: | description: |

1
.zuul.d/project.yaml
View File

@ -61,5 +61,6 @@
- dib-nodepool-functional-openstack-gentoo-src - dib-nodepool-functional-openstack-gentoo-src
- dib-nodepool-functional-openstack-debian-stretch-src - dib-nodepool-functional-openstack-debian-stretch-src
- dib-nodepool-functional-openstack-debian-buster-src - dib-nodepool-functional-openstack-debian-buster-src
- dib-nodepool-functional-openstack-debian-bullseye-src
- octavia-v1-dsvm-scenario - octavia-v1-dsvm-scenario
- octavia-v1-dsvm-py3x-scenario - octavia-v1-dsvm-py3x-scenario

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

@ -18,11 +18,17 @@ DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-/updates}
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
if [ "${DIB_RELEASE}" = "bullseye" ]; then
DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}-security"
else
DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}"
fi
DIB_APT_SOURCES_CONF_DEFAULT=\ DIB_APT_SOURCES_CONF_DEFAULT=\
"default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS} "default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS}
backports:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-backports ${DIB_DEBIAN_COMPONENTS_WS} backports:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-backports ${DIB_DEBIAN_COMPONENTS_WS}
updates:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-updates ${DIB_DEBIAN_COMPONENTS_WS} updates:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-updates ${DIB_DEBIAN_COMPONENTS_WS}
security:deb ${DIB_DEBIAN_SECURITY_MIRROR} ${DIB_RELEASE}${DIB_DEBIAN_SECURITY_SUBPATH} ${DIB_DEBIAN_COMPONENTS_WS} security:deb ${DIB_DEBIAN_SECURITY_MIRROR} ${DIB_DEBIAN_SECURITY_PATH}${DIB_DEBIAN_SECURITY_SUBPATH} ${DIB_DEBIAN_COMPONENTS_WS}
" "
if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" ]; then if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" ]; then

1
diskimage_builder/elements/debootstrap/package-installs.yaml
View File

@ -1,5 +1,6 @@
adduser: adduser:
ca-certificates: ca-certificates:
cloud-initramfs-growroot:
locales: locales:
lsb-release: lsb-release:
phase: pre-install.d phase: pre-install.d

7
diskimage_builder/elements/debootstrap/pkg-map
View File

@ -1,4 +1,11 @@
{ {
"release": {
"debian": {
"bullseye": {
"cloud-initramfs-growroot": "cloud-initramfs-growroot"
}
}
},
"default": { "default": {
"cloud-initramfs-growroot": "" "cloud-initramfs-growroot": ""
} }