From: Robert Varga Date: Sat, 20 Aug 2022 20:46:35 +0000 (+0200) Subject: Support OpenJDK17 in Compose_Base_Java_Command X-Git-Tag: pre-potassium~48 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=cc65506373692c80723052e01ab27396ac226247 Support OpenJDK17 in Compose_Base_Java_Command We need the ability to run Java 17 binaries, make sure we can select the appropriate for them. Signed-off-by: Robert Varga Change-Id: I2f3e66085c0e2505d5a14dbce1d2bf143466ccb2 --- diff --git a/csit/libraries/NexusKeywords.robot b/csit/libraries/NexusKeywords.robot index 120bb6b7c3..7db65e6a63 100644 --- a/csit/libraries/NexusKeywords.robot +++ b/csit/libraries/NexusKeywords.robot @@ -33,6 +33,8 @@ ${JAVA_8_HOME_CENTOS} /usr/lib/jvm/java-1.8.0 ${JAVA_8_HOME_UBUNTU} /usr/lib/jvm/java-8-openjdk-amd64 ${JAVA_11_HOME_CENTOS} /usr/lib/jvm/java-11-openjdk ${JAVA_11_HOME_UBUNTU} /usr/lib/jvm/java-11-openjdk-amd64 +${JAVA_17_HOME_CENTOS} /usr/lib/jvm/java-17-openjdk +${JAVA_17_HOME_UBUNTU} /usr/lib/jvm/java-17-openjdk-amd64 ${JAVA_OPTIONS} -Xmx2560m # Note that '-Xmx=3g' is wrong syntax. Also 3GB heap may not fit in 4GB RAM. ${MAVEN_DEFAULT_OUTPUT_FILENAME} default_maven.log ${MAVEN_OPTIONS} -Pq -Djenkins @@ -192,6 +194,7 @@ Compose_Base_Java_Command # Check whether the user set the override and return it if yes. BuiltIn.Run_Keyword_And_Return_If """${openjdk}""" == "openjdk8" Compose_Dilemma_Filepath ${JAVA_8_HOME_CENTOS}/bin/java ${JAVA_8_HOME_UBUNTU}/bin/java BuiltIn.Run_Keyword_And_Return_If """${openjdk}""" == "openjdk11" Compose_Dilemma_Filepath ${JAVA_11_HOME_CENTOS}/bin/java ${JAVA_11_HOME_UBUNTU}/bin/java + BuiltIn.Run_Keyword_And_Return_If """${openjdk}""" == "openjdk17" Compose_Dilemma_Filepath ${JAVA_17_HOME_CENTOS}/bin/java ${JAVA_17_HOME_UBUNTU}/bin/java # Attempt to call plain "java" command directly. If it works, return it. ${out} ${rc} = SSHLibrary.Execute_Command java -version 2>&1 return_rc=True BuiltIn.Return_From_Keyword_If ${rc} == 0 java