Merge "Drop branch regex for retired branches"
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index b377be1..699874e 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -167,9 +167,6 @@
parent: manila-tempest-plugin-zfsonlinux-base
# https://bugs.launchpad.net/manila/+bug/2087192
nodeset: openstack-single-node-jammy
- branches: &ubuntu_jammy_test_image_branches
- regex: ^stable/(yoga|xena|wallaby|victoria|ussuri)$
- negate: true
- job:
name: manila-tempest-plugin-lvm-base
@@ -242,7 +239,6 @@
description: |
Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack
environment with IPv6 control plane endpoints.
- branches: *ubuntu_jammy_test_image_branches
parent: manila-tempest-plugin-lvm-base
vars:
# TODO(gouthamr): some tests are disabled due to bugs
@@ -345,7 +341,6 @@
Test the scenario test cases on the generic driver multibackend
(DHSS=True) with NFS and CIFS
parent: manila-tempest-plugin-generic-base
- branches: *ubuntu_jammy_test_image_branches
- job:
name: manila-tempest-plugin-generic-scenario-base
@@ -367,7 +362,6 @@
Test the scenario test cases on the generic driver multibackend
(DHSS=True) with NFS and CIFS
parent: manila-tempest-plugin-generic-scenario-base
- branches: *ubuntu_jammy_test_image_branches
- job:
name: manila-tempest-plugin-cephfs-native-base
@@ -412,7 +406,6 @@
name: manila-tempest-plugin-cephfs-native
description: Test CephFS Native (DHSS=False)
parent: manila-tempest-plugin-cephfs-native-base
- branches: *ubuntu_jammy_test_image_branches
- job:
name: manila-tempest-plugin-cephfs-native-cephadm
@@ -498,7 +491,6 @@
name: manila-tempest-plugin-cephfs-nfs
description: Test CephFS NFS (DHSS=False)
parent: manila-tempest-plugin-cephfs-nfs-base
- branches: *ubuntu_jammy_test_image_branches
vars:
tempest_concurrency: 1
# TODO(gouthamr): some tests are disabled due to bugs
@@ -872,9 +864,6 @@
- job:
name: manila-tempest-plugin-lvm-fips
parent: manila-tempest-plugin-lvm-fips-base
- branches:
- regex: ^stable/(yoga|xena|wallaby|victoria|ussuri)$
- negate: true
- job:
name: manila-tempest-plugin-lvm-fips-py311
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index 7e20323..0128c02 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -7,7 +7,7 @@
Test the scenario test cases on the generic driver multibackend
(DHSS=True) with NFS and CIFS
parent: manila-tempest-plugin-generic-scenario-base
- branches: &manila_tempest_image_pinned_branches ^stable/(2023.1|zed|yoga|xena)$
+ branches: &manila_tempest_image_pinned_branches ^(stable|unmaintained)/(zed/2023.1)$
vars: &manila_tempest_image_pinned_vars
devstack_localrc:
# NOTE(carloss): Pinning manila service image to a Focal version,