From 14f199eca26935cfe9306d9785a74d4a9e64ccb6 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Fri, 13 Dec 2024 12:26:10 -0800
Subject: [PATCH] Run cindet-tempest-plugin tests in tempest-extra-tests

We have a lot of Tempest public interfaces which are used by the
tempest plugins and sometime it is not easy to know breaking changes
as we do not test all plugins test when any change merge in Tempest.
Example: https://review.opendev.org/c/openstack/cinder-tempest-plugin/+/937725

To avoid these breaking changes at some extend, let's run the cinder
tempest plugin tests in one of the Temp[est job. Evantually, we can
add more plugins tests if needed but I think cinder-tempest-plugin
uses a good amount of interfaces.

Change-Id: I80c2b77936ac3220ff05232877eaf6fbac4743a5
---
 tools/tempest-extra-tests-list.txt | 5 +++++
 zuul.d/integrated-gate.yaml        | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/tools/tempest-extra-tests-list.txt b/tools/tempest-extra-tests-list.txt
index 9c8810909a..03cf7e92e8 100644
--- a/tools/tempest-extra-tests-list.txt
+++ b/tools/tempest-extra-tests-list.txt
@@ -16,5 +16,10 @@ tempest.api.volume.admin
 tempest.api.image.admin
 tempest.api.network.admin
 
+# This also run cinder-tempest-plugin tests so that we can avoid any
+# breaking change to plugins (cinder-tempest-plugins uses most of the
+# Tempest interface) but we can add more plugins tests here if needed.
+cinder_tempest_plugin
+
 # All negative tests
 negative
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index a9aa3846fe..47b78127fe 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -42,11 +42,18 @@
     description: |
       This job runs the extra tests mentioned in
       tools/tempest-extra-tests-list.txt.
+    # NOTE(gmann): We need c-t-p as this job run c-t-p tests also.
+    required-projects:
+      - opendev.org/openstack/cinder-tempest-plugin
     vars:
       tox_envlist: extra-tests
+      tempest_plugins:
+        - cinder-tempest-plugin
       run_tempest_cleanup: true
       run_tempest_cleanup_resource_list: true
       run_tempest_dry_cleanup: true
+      devstack_localrc:
+        CINDER_ENFORCE_SCOPE: true
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG: