ubuntu: add Focal test

Switch this to testing bionic and focal, dropping xenial Change-Id: Ifba6800ad84e504d248de8389e49a31f22c4554c
2021-10-15 09:56:46 +11:00 · 2021-10-15 09:56:46 +11:00 · f3a3153390
commit f3a3153390
parent 2f1e9320bd
5 changed files with 11 additions and 1 deletions
--- 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
--- a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst
+++ 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
--- a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps
+++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps
@ -0,0 +1,4 @@
+block-device-mbr
+openstack-ci-mirrors
+vm
+
--- 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
@ -0,0 +1 @@
+export DIB_RELEASE=focal
--- 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
@ -0,0 +1 @@
+tar,qcow2