commit 05abbe7a6fbad7786376dee829ffbea3c8c17e9a
author Zuul <zuul@review.opendev.org> Thu Sep 26 21:20:19 2024 +0000
committer Gerrit Code Review <review@openstack.org> Thu Sep 26 21:20:19 2024 +0000
tree f72109486b09779b84875f3c7182db7c5ccfc375
parent 2b649c9cadd24c52e7d37cc29677dcae70e66de0
parent ec47ff719f32ea5fb4e2869956f44170749d1d3c

Merge "zuul: move the storage exclude list to the lvm-lio abstract job"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 276a927..f4354b7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -110,6 +110,7 @@
     vars:
       configure_swap_size: 8192
       tempest_test_regex: '(^tempest\.(api|scenario)|(^cinder_tempest_plugin))'
+      tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-exclude-list.txt'
       tox_envlist: all
       devstack_localrc:
         CINDER_LVM_TYPE: thin
@@ -144,8 +145,6 @@
     # 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
@@ -164,7 +163,6 @@
     vars:
       fetch_subunit_output_additional_dirs:
         - "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
-      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
@@ -189,7 +187,6 @@
     vars:
       fetch_subunit_output_additional_dirs:
         - "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
-      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
@@ -214,7 +211,6 @@
     vars:
       fetch_subunit_output_additional_dirs:
         - "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
-      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
@@ -232,8 +228,6 @@
     required-projects:
       - name: opendev.org/openstack/cinder-tempest-plugin
         override-checkout: 1.3.0
-    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