Migrate tempest provided base jobs to bionic
All the base jobs provided by Tempest are migrated to run in bionic
from stein onwards. As Tempest is branchless, we need to keep running or
available those base job running on xenial for stein before which is
stable/rocky, stable/queens and stable/pike.
The selection of the correct nodeset for this happens mostly
automatically when we avoid selecting nodesets explicitly because we
inherit them from the correct branches of devstack which have the
matching job variants defined.
There are only two places left where we need to explicitly override the
default nodesets:
1. tempest-multinode-full
Here we need to select a nodeset with two nodes. Since this job runs
only on master, we simply select two Bionic nodes instead of two Xenial
nodes now.
2. Stable branch testing jobs like tempest-full-rocky
These do not use branch selectors, but "override-checkout" instead, so
they inherit Bionic nodesets from devstack master branch. We need to
force them to run on Xenial for backwards compatibility.
Drop the tempest-full-py36 job because it will be identical to the
tempest-full-py3 job now.
Depends-On: https://review.openstack.org/610977
Depends-On: https://review.openstack.org/611594
Change-Id: I5a24c697103090f6712d6e9168abe6c86f7c380c
diff --git a/.zuul.yaml b/.zuul.yaml
index f061b12..bf62528 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,6 @@
- job:
name: devstack-tempest
parent: devstack
- nodeset: openstack-single-node
description: |
Base Tempest job.
@@ -53,7 +52,6 @@
- job:
name: devstack-tempest-ipv6
parent: devstack-ipv6
- nodeset: openstack-single-node
description: |
Base Tempest IPv6 job.
required-projects:
@@ -196,7 +194,7 @@
- job:
name: tempest-multinode-full
parent: devstack-tempest
- nodeset: openstack-two-node
+ nodeset: openstack-two-node-bionic
# Until the devstack changes are backported, only run this on master
branches:
- master
@@ -234,16 +232,6 @@
nodes:
- controller
-- job:
- name: tempest-full-py36
- parent: tempest-full-py3
- nodeset: openstack-bionic-node
- branches:
- - master
- description: |
- Base integration test with Neutron networking and py36.
- voting: false
-
- nodeset:
name: openstack-opensuse150-node
nodes:
@@ -286,26 +274,31 @@
- job:
name: tempest-full-rocky
parent: tempest-full
+ nodeset: openstack-single-node-xenial
override-checkout: stable/rocky
- job:
name: tempest-full-rocky-py3
parent: tempest-full-py3
+ nodeset: openstack-single-node-xenial
override-checkout: stable/rocky
- job:
name: tempest-full-queens
parent: tempest-full
+ nodeset: openstack-single-node-xenial
override-checkout: stable/queens
- job:
name: tempest-full-queens-py3
parent: tempest-full-py3
+ nodeset: openstack-single-node-xenial
override-checkout: stable/queens
- job:
name: tempest-full-pike
parent: tempest-full
+ nodeset: openstack-single-node-xenial
override-checkout: stable/pike
- job:
@@ -482,8 +475,6 @@
irrelevant-files: *tempest-irrelevant-files
- tempest-full-py3:
irrelevant-files: *tempest-irrelevant-files
- - tempest-full-py36:
- irrelevant-files: *tempest-irrelevant-files
- tempest-full-py3-ipv6:
voting: false
irrelevant-files: *tempest-irrelevant-files