From ec47ff719f32ea5fb4e2869956f44170749d1d3c Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Fri, 13 Sep 2024 19:58:07 +0200
Subject: [PATCH] zuul: move the storage exclude list to the lvm-lio abstract
 job

Probably for historical reason this was not added to the "eldest" job
where it was needed. The result was that the lvm-nvmet-barbican job
did not use the exclude list, thus running more tests than needed.
A very old variant (probably not in use anymore) requires the old
version of the exclude list variable, and that's left there,
and the old variable being inherited shouldn't be a problem.

Change-Id: Ie576bc660df829288ebdd4bf952bad3c19b2bbcd
---
 .zuul.yaml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 03bf7404..4343f6df 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