From 28821fd283dc53f573996e59ead95ff4a2e8321a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 22 Apr 2022 14:48:18 +1000 Subject: [PATCH] containerfile: update test to jammy We've not really been using the Focal containerfile, as we move forward jammy is a better choice for keeping stable as we might find some new users for it. Also add binutils to bindep for native bullseye builds (see Icb0e40827c9f8ac583fa143545e6bed9641bf613) Change-Id: I22ebe2bbccaec34180e58996b21e47bfc4f36055 --- .zuul.d/jobs.yaml | 2 +- bindep.txt | 1 + .../test-elements/focal-build-succeeds/files/Dockerfile | 2 -- .../{focal-build-succeeds => jammy-build-succeeds}/README.rst | 0 .../{focal-build-succeeds => jammy-build-succeeds}/element-deps | 0 .../environment.d/10-set-distro.bash | 0 .../environment.d/10-set-file.bash | 0 .../test-elements/jammy-build-succeeds/files/Dockerfile | 2 ++ .../test-output-formats | 0 9 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/files/Dockerfile rename diskimage_builder/elements/containerfile/test-elements/{focal-build-succeeds => jammy-build-succeeds}/README.rst (100%) rename diskimage_builder/elements/containerfile/test-elements/{focal-build-succeeds => jammy-build-succeeds}/element-deps (100%) rename diskimage_builder/elements/containerfile/test-elements/{focal-build-succeeds => jammy-build-succeeds}/environment.d/10-set-distro.bash (100%) rename diskimage_builder/elements/containerfile/test-elements/{focal-build-succeeds => jammy-build-succeeds}/environment.d/10-set-file.bash (100%) create mode 100644 diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/files/Dockerfile rename diskimage_builder/elements/containerfile/test-elements/{focal-build-succeeds => jammy-build-succeeds}/test-output-formats (100%) diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 76997202d..ad25445b8 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -21,7 +21,7 @@ nodeset: debian-bullseye vars: dib_functests: - - containerfile/focal-build-succeeds + - containerfile/jammy-build-succeeds - openeuler-minimal/20.03-LTS-SP2-build-succeeds # Image based tests - centos/8-stream-build-succeeds diff --git a/bindep.txt b/bindep.txt index d29cddbdc..b74d2f072 100644 --- a/bindep.txt +++ b/bindep.txt @@ -2,6 +2,7 @@ # see https://docs.openstack.org/infra/bindep/ for additional information. # common +binutils bzip2 util-linux dosfstools diff --git a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/files/Dockerfile b/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/files/Dockerfile deleted file mode 100644 index 59f2c33f1..000000000 --- a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/files/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM docker.io/library/ubuntu:focal -RUN touch /testfile diff --git a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/README.rst b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/README.rst similarity index 100% rename from diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/README.rst rename to diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/README.rst diff --git a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/element-deps b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/element-deps similarity index 100% rename from diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/element-deps rename to diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/element-deps diff --git a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-distro.bash similarity index 100% rename from diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash rename to diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-distro.bash diff --git a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/environment.d/10-set-file.bash b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-file.bash similarity index 100% rename from diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/environment.d/10-set-file.bash rename to diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-file.bash diff --git a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/files/Dockerfile b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/files/Dockerfile new file mode 100644 index 000000000..e66ee2e69 --- /dev/null +++ b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/files/Dockerfile @@ -0,0 +1,2 @@ +FROM docker.io/library/ubuntu:jammy +RUN touch /testfile diff --git a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/test-output-formats b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/test-output-formats similarity index 100% rename from diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/test-output-formats rename to diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/test-output-formats