Merge "containerfile: update test to jammy"

2022-05-03 22:56:35 +00:00 · 2022-05-03 22:56:35 +00:00 · d3ce32016a
commit d3ce32016a
parent a055b59f8d 28821fd283
9 changed files with 4 additions and 3 deletions
--- 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
--- 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
--- a/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/files/Dockerfile
+++ b/diskimage_builder/elements/containerfile/test-elements/focal-build-succeeds/files/Dockerfile
@ -1,2 +0,0 @@
-FROM docker.io/library/ubuntu:focal
-RUN touch /testfile
--- a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/README.rst
+++ b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/README.rst
--- a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/element-deps
+++ b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/element-deps
--- a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-distro.bash
+++ b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-distro.bash
--- a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-file.bash
+++ b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/environment.d/10-set-file.bash
--- a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/files/Dockerfile
+++ 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
--- a/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/test-output-formats
+++ b/diskimage_builder/elements/containerfile/test-elements/jammy-build-succeeds/test-output-formats