From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 5 Dec 2024 19:57:14 +0000 (-0500)
Subject: qa/rgw: bump keystone/barbican from 2023.1 to 2024.1
X-Git-Tag: v18.2.5~160^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8b4dc611ef0716082621f4c4808b9661326d87a8;p=ceph.git

qa/rgw: bump keystone/barbican from 2023.1 to 2024.1

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3162581d2dec6d7006081ef052cfbc0f9bc9d615)

Conflicts:
	qa/suites/rgw/tempest/0-install.yaml -> tasks/rgw_tempest.yaml
---

diff --git a/qa/suites/rgw/crypt/2-kms/barbican.yaml b/qa/suites/rgw/crypt/2-kms/barbican.yaml
index 9bf5fb811314b..e3f788104160a 100644
--- a/qa/suites/rgw/crypt/2-kms/barbican.yaml
+++ b/qa/suites/rgw/crypt/2-kms/barbican.yaml
@@ -27,7 +27,7 @@ tasks:
 - tox: [ client.0 ]
 - keystone:
     client.0:
-      force-branch: stable/2023.1
+      force-branch: stable/2024.1
       services:
         - name: swift
           type: object-store
@@ -68,7 +68,7 @@ tasks:
           project: s3
 - barbican:
     client.0:
-      force-branch: stable/2023.1
+      force-branch: stable/2024.1
       use-keystone-role: client.0
       keystone_authtoken:
         auth_plugin: password
diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
index 020f51a5babe8..b4b80a3d0275c 100644
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
@@ -4,7 +4,7 @@ tasks:
 - tox: [ client.0 ]
 - keystone:
     client.0:
-      force-branch: stable/2023.1
+      force-branch: stable/2024.1
       services:
         - name: swift
           type: object-store