From 269f75c81f946ad3b68d5b92a08c96aa270e3ebc Mon Sep 17 00:00:00 2001 From: Jan Lieskovsky Date: Mon, 13 Jun 2022 13:53:42 +0200 Subject: [PATCH] [CIAM-800] Fix the failing com.redhat.xpaas.sso.ImageTest.testDeclaredEnvironmentVariables test -- the JAVA_HOME and JAVA_VENDOR environment variables are expected to be defined this test to pass The latest JBoss EAP 7.4 with OpenJDK11 for OpenShift container image defines these variables since using "jboss.container.openjdk.jdk" module: * https://github.com/jboss-openshift/cct_module/blob/0.45.4/jboss/container/openjdk/jdk/11/module.yaml But the RH-SSO 7.5.X+ container images don't define these two env vars due to the use of internal "sso-jdk/11" module Signed-off-by: Jan Lieskovsky --- modules/sso/sso-jdk/11/module.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/sso/sso-jdk/11/module.yaml b/modules/sso/sso-jdk/11/module.yaml index 3aad62be..ac4dd3a5 100644 --- a/modules/sso/sso-jdk/11/module.yaml +++ b/modules/sso/sso-jdk/11/module.yaml @@ -12,7 +12,11 @@ labels: value: *jdk_version envs: -- name: "JAVA_VERSION" +- name: JAVA_HOME + value: /usr/lib/jvm/java-11 +- name: JAVA_VENDOR + value: openjdk +- name: JAVA_VERSION value: *jdk_version - name: JBOSS_CONTAINER_OPENJDK_JDK_MODULE value: /opt/jboss/container/openjdk/jdk