From 082397a86a40908a86f5b889ad30af9fdf38143a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 14 Aug 2019 15:43:46 +1000 Subject: [PATCH] Add arm64 based functional test An initial functional test for bionic/arm64 builds, put it in the new arm64 check queue. Change-Id: I5f8a047f41c6555da7211b758c55f7a87b3aa5d1 --- .zuul.d/jobs.yaml | 19 ++++++++++++++++++- .zuul.d/project.yaml | 3 +++ .../11-dib-distribution-mirror.bash | 6 +++++- .../bionic-arm64-build-succeeds/README.rst | 4 ++++ .../bionic-arm64-build-succeeds/element-deps | 3 +++ .../environment.d/10-set-distro.bash | 1 + .../test-output-formats | 1 + 7 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/environment.d/10-set-distro.bash create mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/test-output-formats diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 10371437e..cf33bac9f 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -75,6 +75,16 @@ - ubuntu-systemd-container/bionic-build-succeeds - ubuntu-systemd-container/xenial-build-succeeds +- job: + name: dib-functests-arm64 + description: | + ARM64 build tests + abstract: true + parent: dib-functests-base + vars: + dib_functests: + - ubuntu-minimal/bionic-arm64-build-succeeds + # Trusty / Python 2 tests - job: name: dib-functests-trusty-python2 @@ -199,8 +209,15 @@ vars: dib_python: python2 -# Build and boot functional tests +# ARM64 tests +- job: + name: dib-functests-arm64-bionic + description: | + ARM64 image tests building on am ARM64 Bionic host + nodeset: ubuntu-bionic-arm64 + parent: dib-functests-arm64 +# Build and boot functional tests - job: name: dib-nodepool-functional-src-base description: | diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 83e1b17e8..6a5c1487c 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -32,6 +32,9 @@ - dib-functests-bionic-python3-image - dib-functests-bionic-python3-extras - dib-functests-bionic-python3-containers + check-arm64: + jobs: + - dib-functests-arm64-bionic gate: jobs: - openstack-tox-pylint diff --git a/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash b/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash index 831190844..3ff2f0692 100644 --- a/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash +++ b/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash @@ -21,7 +21,11 @@ $_xtrace # note 11- is after 10- which is where DISTRO_NAME is set usually if [[ "${DISTRO_NAME}" == "ubuntu" ]]; then - export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_UBUNTU_MIRROR + if [[ "${ARCH}" == "arm64" ]]; then + export DIB_DISTRIBUTION_MIRROR=${NODEPOOL_UBUNTU_PORTS_MIRROR} + elif [[ "${ARCH}" == "amd64" ]]; then + export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_UBUNTU_MIRROR + fi export DIB_DEBOOTSTRAP_EXTRA_ARGS+=" --no-check-gpg" elif [[ "${DISTRO_NAME}" == "debian" ]]; then export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_DEBIAN_MIRROR diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/README.rst new file mode 100644 index 000000000..624e34e46 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/README.rst @@ -0,0 +1,4 @@ +Verify we can build a ubuntu-minimal 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-minimal/test-elements/bionic-arm64-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/element-deps new file mode 100644 index 000000000..99857b0c1 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/element-deps @@ -0,0 +1,3 @@ +block-device-efi +openstack-ci-mirrors +vm diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/environment.d/10-set-distro.bash new file mode 100644 index 000000000..ba2fb47d2 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/environment.d/10-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE=bionic diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/test-output-formats new file mode 100644 index 000000000..c780936b8 --- /dev/null +++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/bionic-arm64-build-succeeds/test-output-formats @@ -0,0 +1 @@ +tar,qcow2 \ No newline at end of file