From 47c539b910defe9c39a7b7f3c21ea1cf92916cfd Mon Sep 17 00:00:00 2001 From: Tiago Bueno Date: Thu, 11 Apr 2024 22:34:19 +0000 Subject: [PATCH] fix keycloak upstream version --- .../java/io/brokerqe/claire/Constants.java | 2 +- .../brokerqe/claire/EnvironmentOperator.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/io/brokerqe/claire/Constants.java b/common/src/main/java/io/brokerqe/claire/Constants.java index 8aafb289..9767a7af 100644 --- 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 index fcfe6552..7721881c 100644 --- a/operator-suite/src/main/java/io/brokerqe/claire/EnvironmentOperator.java +++ b/operator-suite/src/main/java/io/brokerqe/claire/EnvironmentOperator.java @@ -328,11 +328,11 @@ 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; } @@ -340,12 +340,12 @@ private String getDefaultKeycloakVersion(String keycloakChannel) { } 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; }