Merge "Stop running jobs for stable/zed"
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index 67a7bb1..1abf5e7 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -228,7 +228,7 @@
name: tempest-multinode-full-py3
parent: tempest-multinode-full-base
nodeset: openstack-two-node-jammy
- # This job runs on ubuntu Jammy and after stable/zed.
+ # This job runs on ubuntu Jammy and after unmaintained/zed.
branches:
regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
negate: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e2505cb..d58862f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -39,7 +39,7 @@
# those in respective stable branch gate.
- tempest-full-2024-1:
irrelevant-files: *tempest-irrelevant-files
- - tempest-full-zed:
+ - tempest-full-2023-1:
irrelevant-files: *tempest-irrelevant-files
- tempest-multinode-full-py3:
irrelevant-files: *tempest-irrelevant-files
@@ -169,8 +169,6 @@
irrelevant-files: *tempest-irrelevant-files
- tempest-all-rbac-old-defaults
- tempest-full-parallel
- - tempest-full-zed-extra-tests
- - tempest-full-enforce-scope-new-defaults-zed
- neutron-ovs-tempest-dvr-ha-multinode-full:
irrelevant-files: *tempest-irrelevant-files
- nova-tempest-v2-api:
@@ -192,15 +190,12 @@
- tempest-full-2024-1
- tempest-full-2023-2
- tempest-full-2023-1
- - tempest-full-zed
- tempest-slow-2024-1
- tempest-slow-2023-2
- tempest-slow-2023-1
- - tempest-slow-zed
- tempest-full-2024-1-extra-tests
- tempest-full-2023-2-extra-tests
- tempest-full-2023-1-extra-tests
- - tempest-full-zed-extra-tests
periodic:
jobs:
- tempest-all
@@ -212,4 +207,3 @@
- tempest-centos9-stream-fips
- tempest-full-centos-9-stream
- tempest-full-test-account-no-admin-py3
- - tempest-full-enforce-scope-new-defaults-zed
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 429c014..9d69715 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -18,12 +18,6 @@
override-checkout: stable/2023.1
- job:
- name: tempest-full-zed
- parent: tempest-full-py3
- nodeset: openstack-single-node-focal
- override-checkout: stable/zed
-
-- job:
name: tempest-full-2024-1-extra-tests
parent: tempest-extra-tests
nodeset: openstack-single-node-jammy
@@ -42,12 +36,6 @@
override-checkout: stable/2023.1
- job:
- name: tempest-full-zed-extra-tests
- parent: tempest-extra-tests
- nodeset: openstack-single-node-focal
- override-checkout: stable/zed
-
-- job:
name: tempest-slow-2024-1
parent: tempest-slow-py3
nodeset: openstack-two-node-jammy
@@ -66,18 +54,6 @@
override-checkout: stable/2023.1
- job:
- name: tempest-full-enforce-scope-new-defaults-zed
- parent: tempest-full-enforce-scope-new-defaults
- nodeset: openstack-single-node-focal
- override-checkout: stable/zed
-
-- job:
- name: tempest-slow-zed
- parent: tempest-slow-py3
- nodeset: openstack-two-node-focal
- override-checkout: stable/zed
-
-- job:
name: tempest-full-py3
parent: devstack-tempest
# This job version is to use the 'full' tox env which
@@ -110,7 +86,7 @@
name: tempest-multinode-full-py3
parent: tempest-multinode-full
nodeset: openstack-two-node-focal
- # This job runs on Focal and supposed to run until stable/zed.
+ # This job runs on Focal and supposed to run until unmaintained/zed.
branches:
- ^.*/victoria
- ^.*/wallaby
@@ -133,7 +109,7 @@
name: tempest-multinode-full
parent: tempest-multinode-full-base
nodeset: openstack-two-node-focal
- # This job runs on Focal and on python2. This is for stable/victoria to stable/zed.
+ # This job runs on Focal and on python2. This is for unmaintained/victoria to unmaintained/zed.
branches:
- ^.*/victoria
- ^.*/wallaby