Merge "No cinderlib testing in 2024.1 and later jobs"
diff --git a/.zuul.yaml b/.zuul.yaml
index d76a9d1..be6d789 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -136,9 +136,22 @@
- job:
name: cinder-tempest-plugin-lvm-barbican-base
description: |
+ This is a base job for lvm with lio & tgt targets.
+ No cinderlib testing beginning with 2024.1 development.
+ # FIXME: the following RE2 expression won't work after the 9999.2 release.
+ # If you are reading this during the 9999.2 development cycle, greetings
+ # from the 21st century!
+ branches: ^(master|(stable/(202[4-9]|20[3-9]\d|2[1-9]\d\d|[3-9]\d\d\d))\.[12])$
+ parent: cinder-tempest-plugin-lvm-barbican-base-abstract
+ vars:
+ tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-exclude-list.txt'
+
+- job:
+ name: cinder-tempest-plugin-lvm-barbican-base
+ description: |
This is a base job for lvm with lio & tgt targets
with cinderlib tests.
- branches: ^(master|stable/(xena|yoga|zed|2\d\d\d\.[12])).*$
+ branches: ^(stable/(xena|yoga|zed|2023\.[12]))$
parent: cinder-tempest-plugin-lvm-barbican-base-abstract
roles:
- zuul: opendev.org/openstack/cinderlib
@@ -216,7 +229,6 @@
- stable/ussuri
parent: cinder-tempest-plugin-lvm-barbican-base-abstract
required-projects:
- - opendev.org/openstack/cinderlib
- name: opendev.org/openstack/cinder-tempest-plugin
override-checkout: 1.3.0
vars: