Merge pull request #4 from rh-openjdk/jdk21_update

Updates to test code to support JDK 21 containers. Correct usage label for UBI8 images.

Author: sefroberg

README.md

@@ -9,8 +9,10 @@ This test suite is designed to be executed against current versions of Red Hat's
 | UBI 8                    | 8               | [openjdk-8](https://catalog.redhat.com/software/containers/ubi8/openjdk-8/5dd6a48dbed8bd164a09589a)                                  |
 | UBI 8                    | 11              | [openjdk-11](https://catalog.redhat.com/software/containers/ubi8/openjdk-11/5dd6a4b45a13461646f677f4)                                |
 | UBI 8                    | 17              | [openjdk-17](https://catalog.redhat.com/software/containers/ubi8/openjdk-17/618bdbf34ae3739687568813)                                |
+| UBI 8                    | 21              | TBD                                                                                                                                  | 
 | UBI 9                    | 11              | [openjdk-11](https://catalog.redhat.com/software/containers/ubi9/openjdk-11/61ee7bafed74b2ffb22b07ab)                                |
 | UBI 9                    | 17              | [openjdk-17](https://catalog.redhat.com/software/containers/ubi9/openjdk-17/61ee7c26ed74b2ffb22b07f6)                                |
+| UBI 9                    | 21              | TBD                                                                                                                                  |
 **Note**: `OpenJDK runtime images are not currently supported by this test suite.` 
 
 ***
@@ -31,6 +33,7 @@ To execute the test suite by hand against a defined version of Red Hat's OpenJDK
 * `MAVEN_HOME=/usr/bin/ mvn clean test -P 8 -P smoke -Dmaven.home=/usr/bin/`
 * `MAVEN_HOME=/usr/bin/ mvn clean test -P 11 -P smoke -Dmaven.home=/usr/bin/`
 * `MAVEN_HOME=/usr/bin/ mvn clean test -P 17 -P smoke -Dmaven.home=/usr/bin/`
+* `MAVEN_HOME=/usr/bin/ mvn clean test -P 21 -P smoke -Dmaven.home=/usr/bin/`
 
 Notice this will execute the test for OpenJDK version 8, 11, or 17. These are the only versions that are supported for testing. To simplify the test execution a `run.sh` has been added. This is the preferred approach to executing tests against the UBI 8 and UBI 9 images. 
 
@@ -39,6 +42,7 @@ For UBI 8 and UBI 9 images it is recommended to use the bash script for the exec
 bash run.sh --jdk-version=8
 bash run.sh --jdk-version=11
 bash run.sh --jdk-version=17
+bash run.sh --jdk-version=21
 ```
 
 ## Configuration

global-test.properties

@@ -3,17 +3,21 @@
 #############################################
 
 # UBI 8 (Rhel 8) version of the container
-xtf.openjdk.8.image=registry.access.redhat.com/ubi8/openjdk-8:1.17-1.1693366248
+xtf.openjdk.8.image=registry.access.redhat.com/ubi8/openjdk-8:1.18-2
 xtf.openjdk.8.version=1.8.0
 
 # UBI 8 (Rhel 8) version of the container
-xtf.openjdk.11.image=registry.access.redhat.com/ubi8/openjdk-11:1.17-1.1693366250
+xtf.openjdk.11.image=registry.access.redhat.com/ubi8/openjdk-11:1.18-2
 xtf.openjdk.11.version=11
 
 #JDK 17 image reference
-xtf.openjdk.17.image=registry.access.redhat.com/ubi8/openjdk-17:1.17-1.1693366272
+xtf.openjdk.17.image=registry.access.redhat.com/ubi8/openjdk-17:1.18-2
 xtf.openjdk.17.version=17
 
+#JDK 21 image reference
+xtf.openjdk.21.image=registry.access.redhat.com/ubi8/openjdk-21:1.18-3
+xtf.openjdk.21.version=21
+
 #############################################
 xtf.openshift.namespace=jdk
 xtf.bm.namespace=jdk-build

run.sh

@@ -47,7 +47,7 @@ do
 done
 
 # Check the OpenJDK Version to make sure the tests supports it.
-if [ $OPENJDK_VERSION -eq 8 ] || [ $OPENJDK_VERSION -eq 11 ] || [ $OPENJDK_VERSION -eq 17 ] ; then
+if [ $OPENJDK_VERSION -eq 8 ] || [ $OPENJDK_VERSION -eq 11 ] || [ $OPENJDK_VERSION -eq 17 ] || [ $OPENJDK_VERSION -eq 21 ] ; then
   echo "OpenJDK version under test is: $OPENJDK_VERSION"
   else
     echo "Unsupported OpenJDK version detected."
@@ -106,3 +106,4 @@ MAVEN_HOME=/usr/share/maven mvn clean test -P $OPENJDK_VERSION -P smoke -Dmaven.
 # MAVEN_HOME=/usr/share/maven mvn clean test -P 8 -P smoke -Dmaven.home=/usr/share/maven
 # MAVEN_HOME=/usr/share/maven mvn clean test -P 11 -P smoke -Dmaven.home=/usr/share/maven
 # MAVEN_HOME=/usr/share/maven mvn clean test -P 17 -P smoke -Dmaven.home=/usr/share/maven
+# MAVEN_HOME=/usr/share/maven mvn clean test -P 21 -P smoke -Dmaven.home=/usr/share/maven

test-openjdk/pom.xml

@@ -211,6 +211,12 @@
                 <xtf.openjdk.subid>17</xtf.openjdk.subid>
             </properties>
         </profile>
+        <profile>
+            <id>21</id>
+            <properties>
+                <xtf.openjdk.subid>21</xtf.openjdk.subid>
+            </properties>
+        </profile>
         <profile>
             <id>smoke</id>
             <properties>
@@ -231,12 +237,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <!--Need tools.jar in compilation classpath. JDK 1.7 no longer has it there by default: -->
-                    <groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
-                    <version>${maven.compiler.target}</version>
-                    <scope>system</scope>
-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+
                 </dependency>
             </dependencies>
         </profile>

test-openjdk/src/test/java/com/redhat/qe/openjdk/OpenJDKTestConfig.java

@@ -45,6 +45,10 @@ public static boolean isOpenJDK17() {
 		return image().getRepo().contains("openjdk-17");
 	}
 
+	public static boolean isOpenJDK21() {
+		return image().getRepo().contains("openjdk-21");
+	}
+
 	// Need to spell out the Rhel 7-based builds because they do not follow the newer
 	// naming conventions.
 	public static boolean isOpenJDK8Rhel7() {

test-openjdk/src/test/java/com/redhat/qe/openjdk/image/AbstractDockerImageTest.java

@@ -57,7 +57,14 @@ public abstract class AbstractDockerImageTest extends OpenJDKTestParent {
 			"jps", "jrunscript", "jshell", "jstack", "jstat",
 			"jstatd", "keytool", "rmiregistry", "serialver"
 	};
-
+	public static final String[] DEFAULT_JAVA_21_UTILITIES = new String[]{
+			"alt-java", "jarsigner", "javac", "javap", "jconsole",
+			"jdeprscan", "jfr", "jimage", "jlink", "jmod", "jps",
+			"jshell", "jstat", "jwebserver", "rmiregistry", "jar",
+			"java", "javadoc", "jcmd", "jdb", "jdeps", "jhsdb",
+			"jinfo", "jmap", "jpackage", "jrunscript", "jstack",
+			"jstatd", "keytool", "serialver"
+	};
 	public static final String RED_HAT_RELEASE_KEY_2 = "199e2f91fd431d51";
 
 	protected static final OpenShift openShift = OpenShifts.master();

test-openjdk/src/test/java/com/redhat/qe/openjdk/image/DockerImageTest.java

@@ -107,7 +107,7 @@ public void testEnvironmentVariablesInContainer() {
 	public void testExposedTcpPorts() {
 		// Port 8778 is from Jolokia and this has been pulled from the JDK17 containers.
 		// This port has also been removed from the ubi9 images.
-		if ( OpenJDKTestConfig.isOpenJDK17() || OpenJDKTestConfig.isRHEL9()) {
+		if ( OpenJDKTestConfig.isOpenJDK17() || OpenJDKTestConfig.isOpenJDK21() || OpenJDKTestConfig.isRHEL9()) {
 			Assertions.assertThat(metadata.exposedPorts("tcp")).containsOnly(8080, 8443);
 		} else {
     		Assertions.assertThat(metadata.exposedPorts("tcp")).containsOnly(8080, 8443, 8778);
@@ -126,11 +126,15 @@ public void testUsageLabel() {
 		if (OpenJDKTestConfig.isRHEL7()){
 			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/");
 		} else if( OpenJDKTestConfig.isOpenJDK8() ) {
-			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://access.redhat.com/documentation/en-us/openjdk/8/html/using_openjdk_8_source-to-image_for_openshift/index");
+			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://jboss-container-images.github.io/openjdk/");
 		} else if (OpenJDKTestConfig.isOpenJDK11()){
-			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://access.redhat.com/documentation/en-us/openjdk/11/html/using_openjdk_11_source-to-image_for_openshift/index");
+			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://jboss-container-images.github.io/openjdk/");
 		} else if (OpenJDKTestConfig.isOpenJDK17()){
+			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://jboss-container-images.github.io/openjdk/");
+		} else if (OpenJDKTestConfig.isRHEL9() && OpenJDKTestConfig.isOpenJDK21()){  //Temp fix until https://issues.redhat.com/browse/OPENJDK-2595
 			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/");
+		} else if (OpenJDKTestConfig.isOpenJDK21()){
+			Assertions.assertThat(metadata.labels().get("usage")).isEqualTo("https://jboss-container-images.github.io/openjdk/");
 		}
 
 	}
@@ -142,7 +146,7 @@ public void testUrandomJavaSecurity() {
 			result = content.shell().execute("cat", "/usr/lib/jvm/java/jre/lib/security/java.security").getOutput();
 		} else if (OpenJDKTestConfig.isOpenJDK11()){
 			result = content.shell().execute("cat", "/usr/lib/jvm/jre/conf/security/java.security").getOutput();
-		} else if (OpenJDKTestConfig.isOpenJDK17()){
+		} else if (OpenJDKTestConfig.isOpenJDK17() || OpenJDKTestConfig.isOpenJDK21()) {
 			result = content.shell().execute("cat", "/usr/lib/jvm/jre/conf/security/java.security").getOutput();
 		}
 
@@ -154,16 +158,24 @@ public void testUrandomJavaSecurity() {
 	@Test
 	public void javaUtilitiesTest() {
         //Content should match what is in the java/bin folder. Or the $JAVA_HOME/bin folder
+		// JDK 8 for UBI 8 and Rhel 7
 		if ( OpenJDKTestConfig.isOpenJDK8() || OpenJDKTestConfig.isOpenJDK8Rhel7() ) {
 			LOGGER.info("DockerImageTest:javaUtilitiesTest::Running check for jdk8.");
 			Assertions.assertThat(content.listDirContent("$JAVA_HOME/bin")).contains(super.DEFAULT_JAVA_8_UTILITIES);
+		// JDK 11 for Rhel 7, UBI 8, UBI 9
 		} else if (OpenJDKTestConfig.isOpenJDK11()){
 			LOGGER.info("DockerImageTest:javaUtilitiesTest::Running check for jdk11.");
 			Assertions.assertThat(content.listDirContent("$JAVA_HOME/bin")).contains(super.DEFAULT_JAVA_11_UTILITIES);
+		// JDK 17 for UBI 8 and UBI 9
 		} else if (OpenJDKTestConfig.isOpenJDK17()){
 			LOGGER.info("DockerImageTest:javaUtilitiesTest::Running check for jdk17");
 			Assertions.assertThat(content.listDirContent("$JAVA_HOME/bin")).contains(super.DEFAULT_JAVA_17_UTILITIES);
 		}
+		// JDK 21 for UBI 8 and UBI 9
+		else if (OpenJDKTestConfig.isOpenJDK21()){
+			LOGGER.info("DockerImageTest:javaUtilitiesTest::Running check for jdk21");
+			Assertions.assertThat(content.listDirContent("$JAVA_HOME/bin")).contains(super.DEFAULT_JAVA_21_UTILITIES);
+		}
 		else {
 			LOGGER.info("DockerImageTest:javaUtilitiesTest::Error, jdk version not supported. Please check jdk container image.");
 			super.javaUtilitiesTest();
@@ -186,16 +198,19 @@ private static Map<String, String> getExpectedEnvironments() {
 		} else {
 			result.put("HOME", "/home/jboss");
 		}
-
-		if (OpenJDKTestConfig.isOpenJ9()) {
-			result.put("JAVA_HOME", OpenJDKTestConfig.isOpenJDK11() ? "/usr/lib/jvm/jre-11-openj9" : "/usr/lib/jvm/jre-1.8.0-openj9");
+		// Supported versions of OpenJDK 8,11, 17, 21
+		if (OpenJDKTestConfig.isOpenJDK21()) {
+			result.put("JAVA_HOME", "/usr/lib/jvm/java-21");
 		} else if (OpenJDKTestConfig.isOpenJDK17()) {
 			result.put("JAVA_HOME", "/usr/lib/jvm/java-17");
 		} else {
 			result.put("JAVA_HOME", OpenJDKTestConfig.isOpenJDK11() ? "/usr/lib/jvm/java-11" : "/usr/lib/jvm/java-1.8.0");
 		}
 		result.put("JAVA_VENDOR", OpenJDKTestConfig.isOpenJ9() ? "AdoptOpenJDK" : "openjdk");
-		if (OpenJDKTestConfig.isOpenJDK17()) {
+
+		if (OpenJDKTestConfig.isOpenJDK21()) {
+			result.put("JAVA_VERSION", "21");
+		} else if (OpenJDKTestConfig.isOpenJDK17()) {
 			result.put("JAVA_VERSION", "17");
 		} else {
 			result.put("JAVA_VERSION", OpenJDKTestConfig.isOpenJDK11() ? "11" : "1.8.0");

test-openjdk/src/test/java/com/redhat/qe/openjdk/maven/MavenJavaArgsTest.java

@@ -180,7 +180,7 @@ public void javaClassPathTest() {
 	@Test
 	public void javaDiagnosticsTest() {
 		deploy(JavaS2IBuild.DOCKER_IMAGE_TEST_APP.getManagedBuild(), Collections.singletonMap("JAVA_DIAGNOSTICS", "true"));
-		if (OpenJDKTestConfig.isOpenJDK17()) {
+		if ( OpenJDKTestConfig.isOpenJDK21() ||OpenJDKTestConfig.isOpenJDK17()) {
 			Assertions.assertThat(getJavaOpts())
 					.containsOnlyOnce("-XX:NativeMemoryTracking=summary")
 					.containsOnlyOnce("-Xlog:gc::utctime");