From 069b9efbebef2df2c104e9acf3ab98518cf1595d Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 18 Apr 2024 16:33:53 -0700
Subject: [PATCH] Update stable branch jobs on master gate

As 2023.2, 2024.1, and 2024.2 is released, we should add
its job on master gate to keep branchless tempest plugins
compatible to stable branch.

Removing Yoga, zed, and 2023.1 job as that is in unmaintained phase.

Ref: Tempest plugins guide for stable branch testing:
- https://docs.openstack.org/tempest/latest/stable_branch_testing_policy.html

In addition, use 'block-storage' service type to detect cinder.

Change-Id: I9b2e2ba2336d285cf6ac35fb1ebeb78cf576a872
---
 .zuul.yaml                                    | 37 +++++++++----------
 .../tests/tempest/api/clients.py              |  2 +-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 89ec7c2..557400a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,20 +1,20 @@
 - job:
-    name: zun-tempest-py3-docker-sql-yoga
-    parent: zun-tempest-py3-docker-sql
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/yoga
-
-- job:
-    name: zun-tempest-py3-docker-sql-zed
-    parent: zun-tempest-py3-docker-sql
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/zed
-
-- job:
-    name: zun-tempest-py3-docker-sql-2023-1
+    name: zun-tempest-py3-docker-sql-2023-2
     parent: zun-tempest-py3-docker-sql
     nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.1
+    override-checkout: stable/2023.2
+
+- job:
+    name: zun-tempest-py3-docker-sql-2024-1
+    parent: zun-tempest-py3-docker-sql
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2024.1
+
+- job:
+    name: zun-tempest-py3-docker-sql-2024-2
+    parent: zun-tempest-py3-docker-sql
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2024.2
 
 - project:
     queue: zun
@@ -25,13 +25,10 @@
     check:
       jobs:
         - zun-tempest-py3-docker-sql
-        - zun-tempest-py3-docker-sql-yoga
-        - zun-tempest-py3-docker-sql-zed
-        - zun-tempest-py3-docker-sql-2023-1
+        - zun-tempest-py3-docker-sql-2023-2
+        - zun-tempest-py3-docker-sql-2024-1
+        - zun-tempest-py3-docker-sql-2024-2
         - zun-tempest-multinode-docker-sql
     gate:
       jobs:
         - zun-tempest-py3-docker-sql
-        - zun-tempest-py3-docker-sql-yoga
-        - zun-tempest-py3-docker-sql-zed
-        - zun-tempest-py3-docker-sql-2023-1
diff --git a/zun_tempest_plugin/tests/tempest/api/clients.py b/zun_tempest_plugin/tests/tempest/api/clients.py
index 8b35408..8c792a1 100644
--- a/zun_tempest_plugin/tests/tempest/api/clients.py
+++ b/zun_tempest_plugin/tests/tempest/api/clients.py
@@ -97,7 +97,7 @@ class Manager(clients.ServiceClients):
                 self.auth_provider, 'network', CONF.identity.region,
                 disable_ssl_certificate_validation=True)
         self.vol_client = volumes_client.VolumesClient(
-            self.auth_provider, 'volumev3', CONF.identity.region,
+            self.auth_provider, 'block-storage', CONF.identity.region,
             disable_ssl_certificate_validation=True)
         self.container_client = ZunClient(self.auth_provider)
         self.neutron_client = networks_client.NetworksClient(