fix keycloak upstream version

rh-messaging-qe · Apr 11, 2024 · 47c539b · 47c539b
1 parent dc44b0d
commit 47c539b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/common/src/main/java/io/brokerqe/claire/Constants.java b/common/src/main/java/io/brokerqe/claire/Constants.java
@@ -61,7 +61,7 @@ public interface Constants {
     // Test related strings
     String DEFAULT_KEYCLOAK_OPERATOR_NAME = "keycloak-operator";
     String DEFAULT_RHSSO_OPERATOR_NAME = "rhbk-operator";
-    String DEFAULT_KEYCLOAK_VERSION = "22.0.5";
+    String DEFAULT_KEYCLOAK_VERSION = "24.0.2";
     String DEFAULT_RHSSO_VERSION = "rhbk-operator.v22.0.9-opr.1";
     String DEFAULT_KEYCLOAK_CHANNEL = "fast";
     String DEFAULT_RHSSO_CHANNEL = "stable-v22";

diff --git a/operator-suite/src/main/java/io/brokerqe/claire/EnvironmentOperator.java b/operator-suite/src/main/java/io/brokerqe/claire/EnvironmentOperator.java
@@ -328,24 +328,24 @@ private String getDefaultKeycloakOperatorName() {
     }
 
     private String getDefaultKeycloakVersion(String keycloakChannel) {
-        if (getDefaultKubeClient().isOpenshiftPlatform()) {
-            return getDefaultKubeClient().getPackageManifestVersion(pm, keycloakChannel);
+        if (isUpstreamArtemis()) {
+            return Constants.DEFAULT_KEYCLOAK_VERSION;
         } else {
-            if (isUpstreamArtemis()) {
-                return Constants.DEFAULT_KEYCLOAK_VERSION;
+            if (getDefaultKubeClient().isOpenshiftPlatform()) {
+                return getDefaultKubeClient().getPackageManifestVersion(pm, keycloakChannel);
             } else {
                 return Constants.DEFAULT_RHSSO_VERSION;
             }
         }
     }
 
     private String getDefaultKeycloakChannel() {
-        if (getDefaultKubeClient().isOpenshiftPlatform()) {
-            pm = getDefaultKubeClient().getPackageManifest(keycloakOperatorName);
-            return getDefaultKubeClient().getPackageManifestDefaultChannel(pm);
+        if (isUpstreamArtemis()) {
+            return Constants.DEFAULT_KEYCLOAK_CHANNEL;
         } else {
-            if (isUpstreamArtemis()) {
-                return Constants.DEFAULT_KEYCLOAK_CHANNEL;
+            if (getDefaultKubeClient().isOpenshiftPlatform()) {
+                pm = getDefaultKubeClient().getPackageManifest(keycloakOperatorName);
+                return getDefaultKubeClient().getPackageManifestDefaultChannel(pm);
             } else {
                 return Constants.DEFAULT_RHSSO_CHANNEL;
             }