From: Tobias Urdin <tobias.urdin@binero.se>
Date: Mon, 14 Mar 2022 15:05:08 +0000 (+0000)
Subject: qa/suites/rgw/tempest: bump openstack versions
X-Git-Tag: v16.2.13~121^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6769c025be3db852811cc63f56046db87efc9e96;p=ceph.git

qa/suites/rgw/tempest: bump openstack versions

Update the versions used for OpenStack Keystone,
Barbican and Tempest projects.

Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit 8310b179f3eff4c0b37da84dd7c24e19f7fac564)
---

diff --git a/qa/suites/rgw/crypt/2-kms/barbican.yaml b/qa/suites/rgw/crypt/2-kms/barbican.yaml
index 94c43895f52..bc059c0a34d 100644
--- a/qa/suites/rgw/crypt/2-kms/barbican.yaml
+++ b/qa/suites/rgw/crypt/2-kms/barbican.yaml
@@ -27,8 +27,7 @@ tasks:
 - tox: [ client.0 ]
 - keystone:
     client.0:
-      sha1: 17.0.0.0rc2
-      force-branch: master
+      force-branch: stable/xena
       projects:
         - name: rgwcrypt
           description: Encryption Tenant
@@ -69,8 +68,7 @@ tasks:
           description: Swift Service
 - barbican:
     client.0:
-      sha1: 5.0.1
-      force-branch: master
+      force-branch: stable/xena
       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 72559c64cc3..f490fb4a2b6 100644
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
@@ -8,8 +8,7 @@ tasks:
 - tox: [ client.0 ]
 - keystone:
     client.0:
-      sha1: 17.0.0.0rc2
-      force-branch: master
+      force-branch: stable/xena
       services:
         - name: swift
           type: object-store
@@ -20,7 +19,7 @@ tasks:
       use-keystone-role: client.0
 - tempest:
     client.0:
-      sha1: train-last
+      sha1: 30.0.0
       force-branch: master
       use-keystone-role: client.0
       auth: