From 2ea0fda5fbac609c18b2d636bcd7fee7f40b90bc Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Fri, 10 May 2024 09:03:47 -0400
Subject: [PATCH] [stable-only] Set volume_image_dep_tests flag

Depends-On: https://review.opendev.org/c/openstack/cinderlib/+/923672

Change I5fee23951958fc00 to cinder-tempest-plugin adds volume<->image
dependency tests that the Bobcat and earlier rbd driver cannot pass,
so until the necessary rbd driver changes are backported, we need to
turn off those tests on jobs using Ceph.

Change-Id: Ida966ba08e6ad53b31b934d55859736c0db4871b
(cherry picked from commit 1ec51a0af0bc505ef201503afb13eab210a30fa3)
Conflicts:
  .zuul.yaml - auto-merging was confused by a job defined in 2023.2
               that doesn't exist in 2024.1
(cherry picked from commit 0cca8c2aaf20cea530278bc481e94d647de1793f)
---
 .zuul.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index db8398b56f3..8c3a29713e4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -162,6 +162,8 @@
           $TEMPEST_CONFIG:
             volume-feature-enabled:
               volume_revert: True
+              volume_image_dep_tests: False
+              enable_volume_image_dep_tests: False
 
 - job:
     name: cinder-plugin-ceph-tempest-mn-aa
@@ -184,6 +186,11 @@
           $CINDER_CONF:
             DEFAULT:
               cluster: ceph
+        test-config:
+          $TEMPEST_CONFIG:
+            volume-feature-enabled:
+              volume_image_dep_tests: False
+              enable_volume_image_dep_tests: False
 
 - job:
     name: cinder-tempest-lvm-multibackend