From f3a315339047e6dbc17c23f2315194af962083a3 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 15 Oct 2021 09:56:46 +1100 Subject: [PATCH] ubuntu: add Focal test Switch this to testing bionic and focal, dropping xenial Change-Id: Ifba6800ad84e504d248de8389e49a31f22c4554c --- .zuul.d/jobs.yaml | 2 +- .../ubuntu/test-elements/focal-build-succeeds/README.rst | 4 ++++ .../ubuntu/test-elements/focal-build-succeeds/element-deps | 4 ++++ .../focal-build-succeeds/environment.d/10-set-distro.bash | 1 + .../test-elements/focal-build-succeeds/test-output-formats | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash create mode 100644 diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index a119ae747..b54aad146 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -50,8 +50,8 @@ - fedora/build-succeeds - opensuse/build-succeeds - opensuse/opensuse15-build-succeeds - - ubuntu/xenial-build-succeeds - ubuntu/bionic-build-succeeds + - ubuntu/focal-build-succeeds - job: name: dib-functests-extras diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst new file mode 100644 index 000000000..35bdfee4e --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/focal-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/focal-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps new file mode 100644 index 000000000..ccdc41079 --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps @@ -0,0 +1,4 @@ +block-device-mbr +openstack-ci-mirrors +vm + diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 000000000..b65a21915 --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=focal diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats new file mode 100644 index 000000000..c780936b8 --- /dev/null +++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats @@ -0,0 +1 @@ +tar,qcow2 \ No newline at end of file