From 1d3a4de4a877273390e9350e296ae2772daa7a39 Mon Sep 17 00:00:00 2001 From: "Dr. Jens Harbott" Date: Wed, 10 Jul 2024 22:00:05 +0200 Subject: [PATCH] Update functests The arm64-deb builds are failing for jammy since debootstrap is too old, let's run them on bookworm instead of bullseye. For consistency do the same for the x86 builds. Also add functests building noble. Depends-On: https://review.opendev.org/c/zuul/nodepool/+/929573 Change-Id: I5b25239a7cacda62d3a46f7b15306446b3cc08e6 --- .zuul.d/jobs.yaml | 7 +++++-- .../test-elements/bookworm-arm64-build-succeeds/README.rst | 1 + .../bookworm-arm64-build-succeeds/element-deps | 2 ++ .../environment.d/10-set-distro.bash | 1 + .../test-elements/noble-arm64-build-succeeds/README.rst | 4 ++++ .../test-elements/noble-arm64-build-succeeds/element-deps | 3 +++ .../environment.d/10-set-distro.bash | 1 + .../noble-arm64-build-succeeds/test-output-formats | 1 + .../ubuntu/test-elements/noble-build-succeeds/README.rst | 4 ++++ .../ubuntu/test-elements/noble-build-succeeds/element-deps | 4 ++++ .../noble-build-succeeds/environment.d/10-set-distro.bash | 1 + .../test-elements/noble-build-succeeds/test-output-formats | 1 + 12 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/environment.d/10-set-distro.bash create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/environment.d/10-set-distro.bash create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/test-output-formats create mode 100644 diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/environment.d/10-set-distro.bash create mode 100644 diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/test-output-formats diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 2c7c5531a..3c6a8361b 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -18,7 +18,7 @@ description: | This is the base set of stable tests parent: dib-functests-base - nodeset: debian-bullseye + nodeset: debian-bookworm vars: dib_functests: - containerfile/jammy-build-succeeds @@ -35,6 +35,7 @@ - ubuntu/bionic-build-succeeds - ubuntu/focal-build-succeeds - ubuntu/jammy-build-succeeds + - ubuntu/noble-build-succeeds # NOTE(ianw) : these jobs are split to keep the build times a bit more # reasonable. @@ -42,14 +43,16 @@ name: dib-functests-arm64-deb description: | ARM64 build tests (Debian-like distros) - nodeset: debian-bullseye-arm64 + nodeset: debian-bookworm-arm64 parent: dib-functests-base vars: dib_functests: - ubuntu-minimal/bionic-arm64-build-succeeds - ubuntu-minimal/focal-arm64-build-succeeds - ubuntu-minimal/jammy-arm64-build-succeeds + - ubuntu-minimal/noble-arm64-build-succeeds - debian-minimal/bullseye-arm64-build-succeeds + - debian-minimal/bookworm-arm64-build-succeeds - job: name: dib-functests-arm64-rpm diff --git a/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/README.rst b/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/README.rst new file mode 100644 index 000000000..3217c8458 --- /dev/null +++ b/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build a debian-minimal stable image. diff --git a/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/element-deps b/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/element-deps new file mode 100644 index 000000000..6374231dd --- /dev/null +++ b/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm diff --git a/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 000000000..2e8628757 --- /dev/null +++ b/diskimage_builder/elements/debian-minimal/test-elements/bookworm-arm64-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=bookworm diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/README.rst new file mode 100644 index 000000000..624e34e46 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/README.rst @@ -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 diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/element-deps new file mode 100644 index 000000000..99857b0c1 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/element-deps @@ -0,0 +1,3 @@ +block-device-efi +openstack-ci-mirrors +vm diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 000000000..5d515d368 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=noble diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/test-output-formats new file mode 100644 index 000000000..c780936b8 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/noble-arm64-build-succeeds/test-output-formats @@ -0,0 +1 @@ +tar,qcow2 \ No newline at end of file diff --git a/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/README.rst new file mode 100644 index 000000000..35bdfee4e --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/README.rst @@ -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 diff --git a/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/element-deps new file mode 100644 index 000000000..ccdc41079 --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/element-deps @@ -0,0 +1,4 @@ +block-device-mbr +openstack-ci-mirrors +vm + diff --git a/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 000000000..5d515d368 --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=noble diff --git a/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/test-output-formats new file mode 100644 index 000000000..c780936b8 --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/noble-build-succeeds/test-output-formats @@ -0,0 +1 @@ +tar,qcow2 \ No newline at end of file