qa/suites/rgw: bump keystone to stable/2025.2

There is keystone-wsgi-public is dropped in latest versions,
so try and use uwsgi

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>

diff --git a/qa/suites/rgw/crypt/2-kms/barbican.yaml b/qa/suites/rgw/crypt/2-kms/barbican.yaml
index 1914dc6e747cf475b8c2f2fba6dde38091659506..3ed91cb5916d8011793c70286a9763b8dcd25974 100644 (file)
--- 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/2024.2
+      force-branch: stable/2025.2
       services:
         - name: swift
           type: object-store
@@ -68,7 +68,7 @@ tasks:
           project: s3
 - barbican:
     client.0:
-      force-branch: stable/2024.2
+      force-branch: stable/2025.2
       use-keystone-role: client.0
       keystone_authtoken:
         auth_plugin: password

diff --git a/qa/suites/rgw/tempest/0-install.yaml b/qa/suites/rgw/tempest/0-install.yaml
index 206fe6d71f843dbd6bbce383318b94b83f623f30..b11d3baf2c75a529ab7d82f9697de09f357f537f 100644 (file)
--- a/qa/suites/rgw/tempest/0-install.yaml
+++ b/qa/suites/rgw/tempest/0-install.yaml
@@ -4,7 +4,7 @@ tasks:
 - tox: [ client.0 ]
 - keystone:
     client.0:
-      force-branch: stable/2024.2
+      force-branch: stable/2025.2
       services:
         - name: swift
           type: object-store

diff --git a/qa/tasks/keystone.py b/qa/tasks/keystone.py
index 2a55213d2b6c4787e715fbb51dedfa0ec3cfb0d4..7d968a46b04d465896ff5119530e5f9f614976ca 100644 (file)
--- a/qa/tasks/keystone.py
+++ b/qa/tasks/keystone.py
@@ -46,7 +46,7 @@ def run_in_keystone_venv(ctx, client, args, **kwargs):
 
 def get_keystone_venved_cmd(ctx, cmd, args, env=[]):
     kbindir = get_keystone_dir(ctx) + '/.tox/venv/bin/'
-    return env + [ kbindir + 'python', kbindir + cmd ] + args
+    return env + [ kbindir + cmd ] + args
 
 @contextlib.contextmanager
 def download(ctx, config):
@@ -196,9 +196,8 @@ def setup_venv(ctx, config):
 
         run_in_keystone_venv(ctx, client,
             [   'pip', 'install',
-                'python-openstackclient==5.2.1',
-                'osc-lib==2.0.0'
-             ])
+                'python-openstackclient', 'uwsgi',
+            ])
     try:
         yield
     finally:
@@ -277,8 +276,10 @@ def run_keystone(ctx, config):
         client_public_with_id = 'keystone.public' + '.' + client_id
 
         public_host, public_port = ctx.keystone.public_endpoints[client]
-        run_cmd = get_keystone_venved_cmd(ctx, 'keystone-wsgi-public',
-            [   '--host', public_host, '--port', str(public_port),
+        run_cmd = get_keystone_venved_cmd(ctx, 'uwsgi',
+            [
+                '--http-socket', f"{public_host}:{public_port}",
+                '--module', 'keystone.wsgi.api:application',
                 # Let's put the Keystone in background, wait for EOF
                 # and after receiving it, send SIGTERM to the daemon.
                 # This crazy hack is because Keystone, in contrast to