Drop EOL branches from job definitions
Stein, Train and Ussuri branches are all completely EOL not and should
be dropped.
Depends-On: https://review.opendev.org/c/openstack/devstack-plugin-nfs/+/910217
Change-Id: If1bcde49c9aabd380e4f3709b0db38a9f57ec2d7
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index c060f6b..a08fe92 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -30,32 +30,6 @@
tox_envlist: ipv6-only
- job:
- name: tempest-full
- parent: devstack-tempest
- description: |
- Base integration test with Neutron networking and py27.
- This job is supposed to run until stable/train setup only.
- If you are running it on stable/ussuri gate onwards for python2.7
- coverage then you need to do override-checkout with any stable
- branch less than or equal to stable/train.
- Former names for this job where:
- * legacy-tempest-dsvm-neutron-full
- * gate-tempest-dsvm-neutron-full-ubuntu-xenial
- vars:
- tox_envlist: full
- devstack_localrc:
- ENABLE_FILE_INJECTION: true
- ENABLE_VOLUME_MULTIATTACH: true
- USE_PYTHON3: False
- devstack_services:
- # NOTE(mriedem): Disable the cinder-backup service from tempest-full
- # since tempest-full is in the integrated-gate project template but
- # the backup tests do not really involve other services so they should
- # be run in some more cinder-specific job, especially because the
- # tests fail at a high rate (see bugs 1483434, 1813217, 1745168)
- c-bak: false
-
-- job:
name: tempest-extra-tests
parent: tempest-full-py3
description: |
@@ -74,7 +48,7 @@
# this job definition is only for stable/xena onwards
# and separate job definition until stable/wallaby
branches:
- regex: ^stable/(stein|train|ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
description: |
Base integration test with Neutron networking, horizon, swift enable,
@@ -108,7 +82,7 @@
nodeset: devstack-single-node-centos-9-stream
# centos-9-stream is supported from yoga release onwards
branches:
- regex: ^stable/(stein|train|ussuri|victoria|wallaby|xena)$
+ regex: ^stable/(victoria|wallaby|xena)$
negate: true
description: |
Base integration test on CentOS 9 stream
@@ -169,7 +143,7 @@
nodeset: devstack-single-node-centos-9-stream
# centos-9-stream is supported from yoga release onwards
branches:
- regex: ^stable/(stein|train|ussuri|victoria|wallaby|xena)$
+ regex: ^stable/(victoria|wallaby|xena)$
negate: true
description: |
This job runs integration tests for compute. This is
@@ -256,7 +230,7 @@
nodeset: openstack-two-node-jammy
# This job runs on ubuntu Jammy and after stable/zed.
branches:
- regex: ^stable/(stein|train|ussuri|victoria|wallaby|xena|yoga|zed)$
+ regex: ^stable/(victoria|wallaby|xena|yoga|zed)$
negate: true
vars:
# NOTE(gmann): Default concurrency is higher (number of cpu -2) which
@@ -320,7 +294,7 @@
# till stable/wallaby, this job definition is only for stable/xena
# onwards and separate job definition until stable/wallaby
branches:
- regex: ^stable/(stein|train|ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
vars:
tox_envlist: slow
@@ -453,7 +427,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
gate:
jobs:
@@ -470,7 +444,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
- project-template:
@@ -513,7 +487,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
gate:
jobs:
@@ -523,14 +497,14 @@
- tempest-integrated-compute
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
periodic-weekly:
jobs:
# centos-9-stream is tested from zed release onwards
- tempest-integrated-compute-centos-9-stream:
branches:
- regex: ^stable/(stein|train|ussuri|victoria|wallaby|xena|yoga)$
+ regex: ^stable/(victoria|wallaby|xena|yoga)$
negate: true
- project-template:
@@ -562,7 +536,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
gate:
jobs:
@@ -579,7 +553,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
- project-template:
@@ -611,7 +585,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
gate:
jobs:
@@ -628,7 +602,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
- project-template:
@@ -653,7 +627,7 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
gate:
jobs:
@@ -670,5 +644,5 @@
# described in https://review.opendev.org/872341
- openstacksdk-functional-devstack:
branches:
- regex: ^stable/(ussuri|victoria|wallaby)$
+ regex: ^stable/(victoria|wallaby)$
negate: true
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index c62209a..50ae841 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -65,7 +65,6 @@
# This job version is to use the 'full' tox env which
# is available for stable/ussuri to stable/wallaby also.
branches:
- - stable/ussuri
- stable/victoria
- stable/wallaby
description: |
@@ -90,79 +89,6 @@
horizon: true
- job:
- name: tempest-full-py3
- parent: devstack-tempest
- # This job version is with swift disabled on py3
- # as swift was not ready on py3 until stable/train.
- branches:
- - stable/stein
- - stable/train
- description: |
- Base integration test with Neutron networking, swift disabled, and py3.
- Former names for this job where:
- * legacy-tempest-dsvm-py35
- * gate-tempest-dsvm-py35
- required-projects:
- - openstack/horizon
- vars:
- tox_envlist: full
- devstack_localrc:
- USE_PYTHON3: true
- FORCE_CONFIG_DRIVE: true
- ENABLE_VOLUME_MULTIATTACH: true
- GLANCE_USE_IMPORT_WORKFLOW: True
- devstack_plugins:
- neutron: https://opendev.org/openstack/neutron
- devstack_local_conf:
- post-config:
- "/$NEUTRON_CORE_PLUGIN_CONF":
- ovs:
- bridge_mappings: public:br-ex
- resource_provider_bandwidths: br-ex:1000000:1000000
- test-config:
- $TEMPEST_CONFIG:
- network-feature-enabled:
- qos_placement_physnet: public
- devstack_services:
- # Enbale horizon so that we can run horizon test.
- horizon: true
- s-account: false
- s-container: false
- s-object: false
- s-proxy: false
- # without Swift, c-bak cannot run (in the Gate at least)
- # NOTE(mriedem): Disable the cinder-backup service from
- # tempest-full-py3 since tempest-full-py3 is in the integrated-gate-py3
- # project template but the backup tests do not really involve other
- # services so they should be run in some more cinder-specific job,
- # especially because the tests fail at a high rate (see bugs 1483434,
- # 1813217, 1745168)
- c-bak: false
- neutron-placement: true
- neutron-qos: true
-
-- job:
- name: tempest-multinode-full-py3
- parent: tempest-multinode-full
- nodeset: openstack-two-node-bionic
- # This job runs on Bionic.
- branches:
- - stable/stein
- - stable/train
- - stable/ussuri
- vars:
- devstack_localrc:
- USE_PYTHON3: true
- devstack_plugins:
- neutron: https://opendev.org/openstack/neutron
- devstack_services:
- neutron-trunk: true
- group-vars:
- subnode:
- devstack_localrc:
- USE_PYTHON3: true
-
-- job:
name: tempest-multinode-full-py3
parent: tempest-multinode-full
nodeset: openstack-two-node-focal
@@ -205,54 +131,11 @@
USE_PYTHON3: False
- job:
- name: tempest-multinode-full
- parent: tempest-multinode-full-base
- nodeset: openstack-two-node-bionic
- # This job runs on Bionic and on python2. This is for stable/stein and stable/train.
- # This job is prepared to make sure all stable branches from stable/stein till stable/train
- # will keep running on bionic. This can be removed once stable/train is EOL.
- branches:
- - stable/stein
- - stable/train
- - stable/ussuri
- vars:
- devstack_localrc:
- USE_PYTHON3: False
- group-vars:
- subnode:
- devstack_localrc:
- USE_PYTHON3: False
-
-- job:
- name: tempest-slow-py3
- parent: tempest-slow
- # This job version is with swift disabled on py3
- # as swift was not ready on py3 until stable/train.
- branches:
- - stable/stein
- - stable/train
- vars:
- devstack_localrc:
- USE_PYTHON3: true
- devstack_services:
- s-account: false
- s-container: false
- s-object: false
- s-proxy: false
- # without Swift, c-bak cannot run (in the Gate at least)
- c-bak: false
- group-vars:
- subnode:
- devstack_localrc:
- USE_PYTHON3: true
-
-- job:
name: tempest-slow-py3
parent: tempest-slow
# This job version is to use the 'slow-serial' tox env for
# the stable/ussuri to stable/wallaby testing.
branches:
- - stable/ussuri
- stable/victoria
- stable/wallaby
vars: