Merge "Migrate tempest provided base jobs to bionic"
diff --git a/.zuul.yaml b/.zuul.yaml
index 9af79a6..750db2f 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:
@@ -492,8 +485,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