From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 22 Sep 2023 21:37:33 +0000 (-0400)
Subject: qa/rgw/sts: keycloak task installs java manually
X-Git-Tag: v17.2.8~260^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=003f44e89ff17fcd00218362c6816665a824d040;p=ceph.git

qa/rgw/sts: keycloak task installs java manually

java had already been installed automatically before centos 9. add an
override to install the jdk-17 packages manually

Fixes: https://tracker.ceph.com/issues/62536

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

Conflicts:
	qa/suites/rgw/sts/tasks/1-keycloak.yaml moved from first.yaml
---

diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
index a7cc0828b274..9a3281f08200 100644
--- a/qa/suites/rgw/sts/tasks/first.yaml
+++ b/qa/suites/rgw/sts/tasks/first.yaml
@@ -10,6 +10,13 @@ tasks:
       rgw_server: client.0
       extra_attrs: ['webidentity_test']
 overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        rpm:
+        - java-17-openjdk-headless
+        deb:
+        - openjdk-17-jdk-headless
   ceph:
     conf:
       client: