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
This commit is contained in:
Ian Wienand 2020-04-21 13:17:51 +10:00
parent 90a21b84b5
commit 5d899d97a0
2 changed files with 11 additions and 31 deletions

View File

@ -194,13 +194,17 @@
nodeset: ubuntu-bionic-arm64 nodeset: ubuntu-bionic-arm64
parent: dib-functests-arm64 parent: dib-functests-arm64
#
# Build and boot functional tests # Build and boot functional tests
#
- job: - job:
name: dib-nodepool-functional-src-base name: dib-nodepool-functional-src-base
description: | description: |
Base job for DIB functional tests, which build and boot a node under Base job for DIB functional tests, which build and boot a node
nodepool under nodepool, using source versions of dependencies such as
parent: nodepool-functional-openstack-src-base nodepool, dib, openstacksdk and glean.
parent: nodepool-functional-container-openstack-siblings-base
vars: vars:
nodepool_debug: true nodepool_debug: true
@ -210,9 +214,6 @@
Test building and booting a Centos 7 image with Nodepool and OpenStack Test building and booting a Centos 7 image with Nodepool and OpenStack
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
vars: vars:
nodepool_extra_packages:
- rpm
- yum-utils
nodepool_diskimage: nodepool_diskimage:
base_element: centos-minimal base_element: centos-minimal
release: '7' release: '7'
@ -224,9 +225,6 @@
Test building and booting a Centos 8 image with Nodepool and OpenStack Test building and booting a Centos 8 image with Nodepool and OpenStack
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
vars: vars:
nodepool_extra_packages:
- rpm
- yum-utils
nodepool_diskimage: nodepool_diskimage:
base_element: centos-minimal base_element: centos-minimal
release: '8' release: '8'
@ -238,9 +236,6 @@
Test building and booting a Fedora 30 image with Nodepool and OpenStack Test building and booting a Fedora 30 image with Nodepool and OpenStack
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
vars: vars:
nodepool_extra_packages:
- rpm
- yum-utils
nodepool_diskimage: nodepool_diskimage:
base_element: fedora-minimal base_element: fedora-minimal
release: '30' release: '30'
@ -251,9 +246,6 @@
Test building and booting a Fedora 31 image with Nodepool and OpenStack Test building and booting a Fedora 31 image with Nodepool and OpenStack
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
vars: vars:
nodepool_extra_packages:
- rpm
- yum-utils
nodepool_diskimage: nodepool_diskimage:
base_element: fedora-minimal base_element: fedora-minimal
release: '31' release: '31'
@ -266,8 +258,6 @@
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml pre-run: playbooks/dib-nodepool/debootstrap.yaml
vars: vars:
nodepool_extra_packages:
- debootstrap
nodepool_diskimage: nodepool_diskimage:
base_element: ubuntu-minimal base_element: ubuntu-minimal
release: 'xenial' release: 'xenial'
@ -305,8 +295,6 @@
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml pre-run: playbooks/dib-nodepool/debootstrap.yaml
vars: vars:
nodepool_extra_packages:
- debootstrap
nodepool_diskimage: nodepool_diskimage:
base_element: ubuntu-minimal base_element: ubuntu-minimal
release: 'bionic' release: 'bionic'
@ -336,8 +324,6 @@
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml pre-run: playbooks/dib-nodepool/debootstrap.yaml
vars: vars:
nodepool_extra_packages:
- debootstrap
nodepool_diskimage: nodepool_diskimage:
base_element: debian-minimal base_element: debian-minimal
release: 'stretch' release: 'stretch'
@ -355,8 +341,6 @@
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
pre-run: playbooks/dib-nodepool/debootstrap.yaml pre-run: playbooks/dib-nodepool/debootstrap.yaml
vars: vars:
nodepool_extra_packages:
- debootstrap
nodepool_diskimage: nodepool_diskimage:
base_element: debian-minimal base_element: debian-minimal
release: 'buster' release: 'buster'
@ -374,9 +358,6 @@
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
nodeset: ubuntu-xenial # Bionic lacks zypper nodeset: ubuntu-xenial # Bionic lacks zypper
vars: vars:
nodepool_extra_packages:
- zypper
- gnupg2
nodepool_diskimage: nodepool_diskimage:
base_element: opensuse-minimal base_element: opensuse-minimal
release: '15.1' release: '15.1'
@ -390,9 +371,6 @@
parent: dib-nodepool-functional-src-base parent: dib-nodepool-functional-src-base
nodeset: ubuntu-xenial # Bionic lacks zypper nodeset: ubuntu-xenial # Bionic lacks zypper
vars: vars:
nodepool_extra_packages:
- zypper
- gnupg2
nodepool_diskimage: nodepool_diskimage:
base_element: opensuse-minimal base_element: opensuse-minimal
release: 'tumbleweed' release: 'tumbleweed'

View File

@ -10,11 +10,12 @@
check: check:
jobs: jobs:
- openstack-tox-pylint - openstack-tox-pylint
- opendev-buildset-registry
- nodepool-build-image-siblings
- dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-centos-8-src
- dib-nodepool-functional-openstack-fedora-31-src - dib-nodepool-functional-openstack-fedora-31-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-xenial-src
- dib-nodepool-functional-openstack-ubuntu-bionic
- dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-functests-centos7-python2 - dib-functests-centos7-python2
- dib-functests-centos7-python2-image - dib-functests-centos7-python2-image
@ -45,11 +46,12 @@
gate: gate:
jobs: jobs:
- openstack-tox-pylint - openstack-tox-pylint
- opendev-buildset-registry
- nodepool-build-image-siblings
- dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-centos-7-src
- dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-centos-8-src
- dib-nodepool-functional-openstack-fedora-31-src - dib-nodepool-functional-openstack-fedora-31-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-xenial-src
- dib-nodepool-functional-openstack-ubuntu-bionic
- dib-nodepool-functional-openstack-ubuntu-bionic-src - dib-nodepool-functional-openstack-ubuntu-bionic-src
- dib-functests-xenial-python3 - dib-functests-xenial-python3
- dib-functests-centos7-python2 - dib-functests-centos7-python2