From 5d899d97a00f5672670d34c6ebe9a1de319e4e2b Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 21 Apr 2020 13:17:51 +1000 Subject: [PATCH] Switch functional tests to containers This switches the functional tests to container based build jobs. This is mostly transparent for the existing build and boot jobs. The release test is a bit interesting here. The nodepool container-based release job doesn't work in this context because it doesn't have a way to also include dib from the zuul checkout into the container -- ergo it's pointless to run in the dib gate. We should probably reorganise the nodepool siblings job so it can check some projects out from tags, then we could run something similar to this with nodepool/openstacksdk/glean etc checked out from tags if we want. We can handle this in a future update so we can test these images which we want to build in our production container asap. Depends-On: https://review.opendev.org/722556 Depends-On: https://review.opendev.org/722549 Change-Id: Ieaf07438c145ba609d4d7b9a055e91b894eca6d9 --- .zuul.d/jobs.yaml | 36 +++++++----------------------------- .zuul.d/project.yaml | 6 ++++-- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 42a9b147..b5517ad6 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -194,13 +194,17 @@ nodeset: ubuntu-bionic-arm64 parent: dib-functests-arm64 +# # Build and boot functional tests +# + - job: name: dib-nodepool-functional-src-base description: | - Base job for DIB functional tests, which build and boot a node under - nodepool - parent: nodepool-functional-openstack-src-base + Base job for DIB functional tests, which build and boot a node + under nodepool, using source versions of dependencies such as + nodepool, dib, openstacksdk and glean. + parent: nodepool-functional-container-openstack-siblings-base vars: nodepool_debug: true @@ -210,9 +214,6 @@ Test building and booting a Centos 7 image with Nodepool and OpenStack parent: dib-nodepool-functional-src-base vars: - nodepool_extra_packages: - - rpm - - yum-utils nodepool_diskimage: base_element: centos-minimal release: '7' @@ -224,9 +225,6 @@ Test building and booting a Centos 8 image with Nodepool and OpenStack parent: dib-nodepool-functional-src-base vars: - nodepool_extra_packages: - - rpm - - yum-utils nodepool_diskimage: base_element: centos-minimal release: '8' @@ -238,9 +236,6 @@ Test building and booting a Fedora 30 image with Nodepool and OpenStack parent: dib-nodepool-functional-src-base vars: - nodepool_extra_packages: - - rpm - - yum-utils nodepool_diskimage: base_element: fedora-minimal release: '30' @@ -251,9 +246,6 @@ Test building and booting a Fedora 31 image with Nodepool and OpenStack parent: dib-nodepool-functional-src-base vars: - nodepool_extra_packages: - - rpm - - yum-utils nodepool_diskimage: base_element: fedora-minimal release: '31' @@ -266,8 +258,6 @@ parent: dib-nodepool-functional-src-base pre-run: playbooks/dib-nodepool/debootstrap.yaml vars: - nodepool_extra_packages: - - debootstrap nodepool_diskimage: base_element: ubuntu-minimal release: 'xenial' @@ -305,8 +295,6 @@ parent: dib-nodepool-functional-src-base pre-run: playbooks/dib-nodepool/debootstrap.yaml vars: - nodepool_extra_packages: - - debootstrap nodepool_diskimage: base_element: ubuntu-minimal release: 'bionic' @@ -336,8 +324,6 @@ parent: dib-nodepool-functional-src-base pre-run: playbooks/dib-nodepool/debootstrap.yaml vars: - nodepool_extra_packages: - - debootstrap nodepool_diskimage: base_element: debian-minimal release: 'stretch' @@ -355,8 +341,6 @@ parent: dib-nodepool-functional-src-base pre-run: playbooks/dib-nodepool/debootstrap.yaml vars: - nodepool_extra_packages: - - debootstrap nodepool_diskimage: base_element: debian-minimal release: 'buster' @@ -374,9 +358,6 @@ parent: dib-nodepool-functional-src-base nodeset: ubuntu-xenial # Bionic lacks zypper vars: - nodepool_extra_packages: - - zypper - - gnupg2 nodepool_diskimage: base_element: opensuse-minimal release: '15.1' @@ -390,9 +371,6 @@ parent: dib-nodepool-functional-src-base nodeset: ubuntu-xenial # Bionic lacks zypper vars: - nodepool_extra_packages: - - zypper - - gnupg2 nodepool_diskimage: base_element: opensuse-minimal release: 'tumbleweed' diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 376efb17..ff6cd9de 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -10,11 +10,12 @@ check: jobs: - openstack-tox-pylint + - opendev-buildset-registry + - nodepool-build-image-siblings - dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-fedora-31-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - - dib-nodepool-functional-openstack-ubuntu-bionic - dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-functests-centos7-python2 - dib-functests-centos7-python2-image @@ -45,11 +46,12 @@ gate: jobs: - openstack-tox-pylint + - opendev-buildset-registry + - nodepool-build-image-siblings - dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-fedora-31-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - - dib-nodepool-functional-openstack-ubuntu-bionic - dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-functests-xenial-python3 - dib-functests-centos7-python2