openstack/diskimage-builder
Code Issues Proposed changes

Add Jammy functesting to dib

Browse Source 
This adds arm64 ubuntu-minimal Jammy functests and x86 ubuntu image
based Jammy functests. To make this happen we have to install
debootstrap from debian unstable on the functest nodes in order to get
access to a debootstrap that knows what jammy is.

As we ramp up Jammy support in our tools having good testing will be
helpful.

Change-Id: I1d1dc752ce176457d0656cbd50e27a2721ca9856
This commit is contained in:
Clark Boylan 2022-05-03 15:53:34 -07:00
parent d3ce32016a
commit 7b6247554e
13 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.d/jobs.yaml
View File

@ -29,6 +29,7 @@
- fedora/build-succeeds
- ubuntu/bionic-build-succeeds
- ubuntu/focal-build-succeeds
- ubuntu/jammy-build-succeeds
# NOTE(ianw) : these jobs are split to keep the build times a bit more
# reasonable.
@ -42,6 +43,7 @@
dib_functests:
- ubuntu-minimal/bionic-arm64-build-succeeds
- ubuntu-minimal/focal-arm64-build-succeeds
- ubuntu-minimal/jammy-arm64-build-succeeds
- debian-minimal/bullseye-arm64-build-succeeds
- job:

1
bindep.txt
View File

@ -27,6 +27,7 @@ uuid-runtime [platform:dpkg]
yum-utils [platform:dpkg !platform:ubuntu-focal !platform:debian-bullseye]
dnf [platform:debian-bullseye]
debootstrap [platform:dpkg]
zstd [platform:dpkg]
procps [platform:dpkg]
# centos/fedora

4
diskimage_builder/elements/ubuntu-minimal/test-elements/jammy-arm64-build-succeeds/README.rst Normal file
View File

@ -0,0 +1,4 @@
Verify we can build a ubuntu-minimal image.
Note this test includes the vm element to test the bootloader install,
and specifies to output a .qcow2

3
diskimage_builder/elements/ubuntu-minimal/test-elements/jammy-arm64-build-succeeds/element-deps Normal file
View File

@ -0,0 +1,3 @@
block-device-efi
openstack-ci-mirrors
vm

1
diskimage_builder/elements/ubuntu-minimal/test-elements/jammy-arm64-build-succeeds/environment.d/10-set-distro.bash Normal file
View File

@ -0,0 +1 @@
export DIB_RELEASE=jammy

1
diskimage_builder/elements/ubuntu-minimal/test-elements/jammy-arm64-build-succeeds/test-output-formats Normal file
View File

@ -0,0 +1 @@
tar,qcow2

4
diskimage_builder/elements/ubuntu/test-elements/jammy-build-succeeds/README.rst Normal file
View File

@ -0,0 +1,4 @@
Verify we can build a ubuntu image.
Note this test includes the vm element to test the bootloader install,
and specifies to output a .qcow2

4
diskimage_builder/elements/ubuntu/test-elements/jammy-build-succeeds/element-deps Normal file
View File

@ -0,0 +1,4 @@
block-device-mbr
openstack-ci-mirrors
vm

1
diskimage_builder/elements/ubuntu/test-elements/jammy-build-succeeds/environment.d/10-set-distro.bash Normal file
View File

@ -0,0 +1 @@
export DIB_RELEASE=jammy

1
diskimage_builder/elements/ubuntu/test-elements/jammy-build-succeeds/test-output-formats Normal file
View File

@ -0,0 +1 @@
tar,qcow2

1
playbooks/dib-functests/run.yaml
View File

@ -5,5 +5,6 @@
- bindep
- dib-setup-gate-mirrors
- ensure-podman
- dib-ensure-debootstrap
- dib-functests

2
roles/dib-ensure-debootstrap/README.rst Normal file
View File

@ -0,0 +1,2 @@
Update debootstap from debian unstable. This ensures debootstrap is new
enough to recognize Jammy.

12
roles/dib-ensure-debootstrap/tasks/main.yaml Normal file
View File

@ -0,0 +1,12 @@
- 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/unstable
# Remove the use of unstable as it seems to interfere with other tasks
rm /etc/apt/sources.list.d/unstable-debian.list
apt-get update