From fa56c21109abd1312be1eb2d4ccb0ce8ce4f8a50 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 14 Dec 2021 16:19:26 +1100 Subject: [PATCH] Add debian-bullseye-arm64 build test This does a basic vm build test of bullseye-arm64, which currently is missing from the ARM64 testing. To keep runtimes a bit more reasonable, split the job into two parts, one for deb distros and one for rpm. Change-Id: I0f28ff92e1b8d08d56b82b392e2cc355d567d007 --- .zuul.d/jobs.yaml | 16 ++++++++++++++-- .zuul.d/project.yaml | 3 ++- .../bullseye-arm64-build-succeeds/README.rst | 1 + .../bullseye-arm64-build-succeeds/element-deps | 2 ++ .../environment.d/10-set-distro.bash | 1 + 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/environment.d/10-set-distro.bash diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 676b878e..a7cab07e 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -30,16 +30,28 @@ - ubuntu/bionic-build-succeeds - ubuntu/focal-build-succeeds +# NOTE(ianw) : these jobs are split to keep the build times a bit more +# reasonable. - job: - name: dib-functests-arm64 + name: dib-functests-arm64-deb description: | - ARM64 build tests + ARM64 build tests (Debian-like distros) nodeset: debian-bullseye-arm64 parent: dib-functests-base vars: dib_functests: - ubuntu-minimal/bionic-arm64-build-succeeds - ubuntu-minimal/focal-arm64-build-succeeds + - debian-minimal/bullseye-arm64-build-succeeds + +- job: + name: dib-functests-arm64-rpm + description: | + ARM64 build tests (RPM-like distros) + nodeset: debian-bullseye-arm64 + parent: dib-functests-base + vars: + dib_functests: - centos-minimal/8-aarch64-build-succeeds - centos-minimal/8-stream-aarch64-build-succeeds - openeuler-minimal/20.03-LTS-SP2-build-succeeds diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 33989321..eb658a56 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -38,7 +38,8 @@ voting: false check-arm64: jobs: - - dib-functests-arm64 + - dib-functests-arm64-deb + - dib-functests-arm64-rpm gate: jobs: - openstack-tox-pylint diff --git a/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/README.rst b/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/README.rst new file mode 100644 index 00000000..3217c845 --- /dev/null +++ b/diskimage_builder/elements/debian-minimal/test-elements/bullseye-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/bullseye-arm64-build-succeeds/element-deps b/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/element-deps new file mode 100644 index 00000000..6374231d --- /dev/null +++ b/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm diff --git a/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 00000000..0497fa2f --- /dev/null +++ b/diskimage_builder/elements/debian-minimal/test-elements/bullseye-arm64-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=bullseye