diff --git a/.zuul.yaml b/.zuul.yaml
index fb2c551502..2c05502c95 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,13 +1,3 @@
-- nodeset:
- name: openstack-single-node
- nodes:
- - name: controller
- label: ubuntu-xenial
- groups:
- - name: tempest
- nodes:
- - controller
-
- nodeset:
name: openstack-single-node-focal
nodes:
@@ -28,56 +18,6 @@
nodes:
- controller
-- nodeset:
- name: openstack-single-node-xenial
- nodes:
- - name: controller
- label: ubuntu-xenial
- groups:
- - name: tempest
- nodes:
- - controller
-
-- nodeset:
- name: devstack-single-node-opensuse-15
- nodes:
- - name: controller
- label: opensuse-15
- groups:
- - name: tempest
- nodes:
- - controller
-
-- nodeset:
- name: openstack-two-node
- nodes:
- - name: controller
- label: ubuntu-xenial
- - name: compute1
- label: ubuntu-xenial
- groups:
- # Node where tests are executed and test results collected
- - name: tempest
- nodes:
- - controller
- # Nodes running the compute service
- - name: compute
- nodes:
- - controller
- - compute1
- # Nodes that are not the controller
- - name: subnode
- nodes:
- - compute1
- # Switch node for multinode networking setup
- - name: switch
- nodes:
- - controller
- # Peer nodes for multinode networking setup
- - name: peers
- nodes:
- - compute1
-
- nodeset:
name: openstack-two-node-focal
nodes:
@@ -138,36 +78,6 @@
nodes:
- compute1
-- nodeset:
- name: openstack-two-node-xenial
- nodes:
- - name: controller
- label: ubuntu-xenial
- - name: compute1
- label: ubuntu-xenial
- groups:
- # Node where tests are executed and test results collected
- - name: tempest
- nodes:
- - controller
- # Nodes running the compute service
- - name: compute
- nodes:
- - controller
- - compute1
- # Nodes that are not the controller
- - name: subnode
- nodes:
- - compute1
- # Switch node for multinode networking setup
- - name: switch
- nodes:
- - controller
- # Peer nodes for multinode networking setup
- - name: peers
- nodes:
- - compute1
-
- nodeset:
name: openstack-three-node-focal
nodes:
@@ -544,13 +454,6 @@
# we often have to rush things through devstack to stabilise the gate,
# and these platforms don't have the round-the-clock support to avoid
# becoming blockers in that situation.
-- job:
- name: devstack-platform-opensuse-15
- parent: tempest-full-py3
- description: openSUSE 15.x platform test
- nodeset: devstack-single-node-opensuse-15
- voting: false
-
- job:
name: devstack-platform-bionic
parent: tempest-full-py3
@@ -667,10 +570,6 @@
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- - openstacksdk-functional-devstack:
- irrelevant-files:
- - ^.*\.rst$
- - ^doc/.*$
- tempest-ipv6-only:
irrelevant-files:
- ^.*\.rst$
@@ -705,10 +604,6 @@
# irrelevant-files:
# - ^.*\.rst$
# - ^doc/.*$
- - openstacksdk-functional-devstack:
- irrelevant-files:
- - ^.*\.rst$
- - ^doc/.*$
- tempest-ipv6-only:
irrelevant-files:
- ^.*\.rst$