Clean up Excludes Test List jdk21- 2nd pass

buildenv/jenkins/JenkinsfileBase

@@ -767,25 +767,15 @@ def runTest( ) {
 		for (int i = 1; i <= ITERATIONS; i++) {
 			echo "ITERATION: ${i}/${ITERATIONS}"
 			if (env.SPEC.contains('linux') && !(LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER == 'azure') && (BUILD_LIST != "external")) {
-				// RHEL10 uses Wayland instead of X11
-				// TODO: once proper label is added on the machine, NODE_NAME check should be removed.
-				if (LABEL.contains("sw.os.rhel.10") || "${NODE_NAME}".toLowerCase().contains("rhel10")) {
-					sh "weston --no-config --socket=wayland-vfb --backend=headless-backend.so --xwayland &"
-					env.DISPLAY = ":0"
-
+				// Add an additional 10 second timeout due to issue: https://github.com/adoptium/temurin-build/issues/2368#issuecomment-756683888
+				wrap([$class: 'Xvfb', autoDisplayName: true, timeout:20]) {
+					def DISPLAY = sh (
+							script: 'ps -f | grep \'[X]vfb\' | awk \'{print \$9}\'',
+							returnStdout: true
+					).trim()
+					env.DISPLAY = "${DISPLAY}"
 					echo "env.DISPLAY is ${env.DISPLAY}"
 					makeTest("${RUNTEST_CMD}")
-				} else {
-					// Add an additional 10 second timeout due to issue: https://github.com/adoptium/temurin-build/issues/2368#issuecomment-756683888
-					wrap([$class: 'Xvfb', autoDisplayName: true, timeout:20]) {
-						def DISPLAY = sh (
-								script: 'ps -f | grep \'[X]vfb\' | awk \'{print \$9}\'',
-								returnStdout: true
-						).trim()
-						env.DISPLAY = "${DISPLAY}"
-						echo "env.DISPLAY is ${env.DISPLAY}"
-						makeTest("${RUNTEST_CMD}")
-					}
 				}
 			} else if (BUILD_LIST.contains('external')) {
 				sshagent (credentials: ["$params.SSH_AGENT_CREDENTIAL"], ignoreMissing: true) {
@@ -1222,10 +1212,6 @@ def addGrinderLink() {
 		if (key == "LIGHT_WEIGHT_CHECKOUT") {
 			value = "false"
 		}
-		// Always set RERUN_FAILURE to false for Grinder Link
-		if (key == "RERUN_FAILURE"){
-			value = "false"
-		}
 		// Always set Parallel to None for Grinder link
 		if (key == "PARALLEL") {
 			value = "None"
@@ -1255,7 +1241,6 @@ def addFailedTestsGrinderLink(paths=""){
 		def failedTestList = ""
 		def jdkFailedTestCaseList = ""
 		def hotspotFailedTestCaseList = ""
-		def langtoolsFailedTestCaseList = ""
 		def jckRuntimeFailedTestCaseList = ""
 		def jckCompilerFailedTestCaseList = ""
 		def jckDevtoolsFailedTestCaseList = ""
@@ -1280,7 +1265,7 @@ def addFailedTestsGrinderLink(paths=""){
 								if (failedtest.startsWith("jdk_")) {
 									if (!jdkFailedTestCaseList.contains(failedTestCasesInfo)) {
 										jdkFailedTestCaseList += "${failedTestCasesInfo} "
-									}
+									}									
 								} else if (failedtest.startsWith("jck-runtime") || failedtest.startsWith("jckruntime")) {
 									if (!jckRuntimeFailedTestCaseList.contains(failedTestCasesInfo)) {
 										jckRuntimeFailedTestCaseList += "${failedTestCasesInfo} "
@@ -1293,10 +1278,6 @@ def addFailedTestsGrinderLink(paths=""){
 									if (!jckDevtoolsFailedTestCaseList.contains(failedTestCasesInfo)) {
 										jckDevtoolsFailedTestCaseList += "${failedTestCasesInfo} "
 									}
-								} else if (failedtest.startsWith("langtools_")){
-									if (!langtoolsFailedTestCaseList.contains(failedTestCasesInfo)) {
-										langtoolsFailedTestCaseList += "${failedTestCasesInfo} "
-									}
 								} else {
 									if (!hotspotFailedTestCaseList.contains(failedTestCasesInfo)) {
 										hotspotFailedTestCaseList += "${failedTestCasesInfo} "
@@ -1324,9 +1305,6 @@ def addFailedTestsGrinderLink(paths=""){
 			if (hotspotFailedTestCaseList) {
 				customizedTestCases['hotspot'] = "${hotspotFailedTestCaseList}"
 			}
-			if (langtoolsFailedTestCaseList) {
-				customizedTestCases['langtools'] = "${langtoolsFailedTestCaseList}"
-			}
 			if (jckRuntimeFailedTestCaseList) {
 				customizedTestCases['jckruntime'] = "${jckRuntimeFailedTestCaseList}"
 			}

functional/OpenJcePlusTests/build.xml

@@ -95,6 +95,7 @@
 			<arg value="-f"/>
 			<arg value="${repo_sha}"/>
 		</exec>
+		<checkGitRepoSha repoDir="OpenJCEPlus" />
 		<addTestenvProperties repoDir="OpenJCEPlus" repoName="OpenJCEPlus"/>
 
 		<delete dir="./OpenJCEPlus/src/main" />

functional/security/Crypto/build.xml

@@ -43,6 +43,7 @@
 	</if>
 	<target name="getCryptoTest" depends="cryptoTest.check" unless="cryptoTestdir.exists">
 		<getFileWithRetry file="CryptoTest" command="git clone --depth 1 -q ${GIT_REPO}rh-openjdk/CryptoTest.git -b master CryptoTest"/>
+		<checkGitRepoSha repoDir="CryptoTest"/>
 	</target>
 
 	<target name="init">

get.sh

@@ -570,6 +570,7 @@ getTestKitGen()
 	echo "git checkout -q -f $tkg_sha"
 	git checkout -q -f $tkg_sha
 
+	checkTestRepoSHAs
 }
 
 getCustomJtreg()
@@ -659,11 +660,8 @@ getFunctionalTestMaterial()
 	else
 		mv openj9/test/functional functional
 	fi
-
-	cd openj9
-	git rm -rqf .
-	git clean -fxd
-	cd $TESTDIR
+
+	rm -rf openj9
 }
 
 getVendorTestMaterial() {
@@ -748,11 +746,7 @@ getVendorTestMaterial() {
 		fi
 
 		# clean up
-		cd $dest
-		git rm -rqf .
-		git clean -fxd
-		cd $TESTDIR
-
+		rm -rf $dest
 	done
 }
 
@@ -814,12 +808,30 @@ testJavaVersion()
 
 checkRepoSHA()
 {
+	sha_file="$TESTDIR/TKG/SHA.txt"
 	testenv_file="$TESTDIR/testenv/testenv.properties"
 
+	echo "$TESTDIR/TKG/scripts/getSHA.sh --repo_dir $1 --output_file $sha_file"
+	$TESTDIR/TKG/scripts/getSHA.sh --repo_dir $1 --output_file $sha_file
+
 	echo "$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2"
 	$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2
 }
 
+checkTestRepoSHAs()
+{
+	echo "check adoptium repo and TKG repo SHA"
+
+	output_file="$TESTDIR/TKG/SHA.txt"
+	if [ -e ${output_file} ]; then
+		echo "rm $output_file"
+		rm ${output_file}
+	fi
+
+	checkRepoSHA "$TESTDIR" "ADOPTOPENJDK"
+	checkRepoSHA "$TESTDIR/TKG" "TKG"
+}
+
 checkOpenJ9RepoSHA()
 {
 	echo "check OpenJ9 Repo sha"

openjdk/build.xml

@@ -232,6 +232,7 @@
 				</if>
 			</else>
 		</if>
+		<checkGitRepoSha repoDir="openjdk-jdk"/>
 		<addTestenvProperties repoDir="openjdk-jdk" repoName="JDK${env.JDK_VERSION}"/>
 	</target>
 

openjdk/excludes/ProblemList_openjdk11-openj9.txt

@@ -208,7 +208,6 @@ com/sun/net/httpserver/bugs/B6361557.java	https://github.com/adoptium/aqa-tests/
 # jdk_imageio
 
 javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java https://github.com/eclipse-openj9/openj9/issues/19527 windows-all
-javax/imageio/plugins/shared/ImageWriterCompressionTest.java https://github.com/eclipse-openj9/openj9/issues/14948 linux-s390x
 
 ############################################################################
 
@@ -367,7 +366,6 @@ java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java 	htt
 java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java	https://github.com/eclipse-openj9/openj9/issues/3447	generic-all
 java/util/WeakHashMap/GCDuringIteration.java	https://github.com/adoptium/aqa-tests/issues/1297	generic-all
 java/util/zip/CloseInflaterDeflaterTest.java	https://github.com/eclipse-openj9/openj9/issues/14948	linux-s390x
-java/util/zip/DeflateIn_InflateOut.java https://github.com/eclipse-openj9/openj9/issues/14948 linux-s390x
 java/util/zip/ZipFile/TestCleaner.java	https://github.com/eclipse-openj9/openj9/issues/8872 	generic-all
 
 ############################################################################

openjdk/excludes/ProblemList_openjdk11.txt

@@ -203,8 +203,7 @@ java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java https://github.c
 
 # jdk_tools
 
-#sun/tools/jhsdb/JShellHeapDumpTest.java https://github.com/adoptium/aqa-tests/issues/5871 windows-all
-sun/tools/jhsdb/JShellHeapDumpTest.java https://github.com/adoptium/aqa-tests/issues/4155 windows-all
+sun/tools/jhsdb/JShellHeapDumpTest.java https://github.com/adoptium/aqa-tests/issues/4155 windows-aarch64
 sun/tools/jstatd/TestJstatdExternalRegistry.java https://bugs.openjdk.java.net/browse/JDK-8081569 linux-all
 sun/tools/jstatd/TestJstatdPort.java https://bugs.openjdk.java.net/browse/JDK-8081569 linux-all
 sun/tools/jstatd/TestJstatdPortAndServer.java https://bugs.openjdk.java.net/browse/JDK-8081569 linux-all
@@ -346,11 +345,9 @@ runtime/cds/appcds/CommandLineFlagCombo.java https://github.com/adoptium/aqa-tes
 runtime/cds/appcds/LambdaEagerInit.java https://github.com/adoptium/aqa-tests/issues/5378  windows-x86
 runtime/cds/appcds/TestDumpClassListSource.java https://github.com/adoptium/aqa-tests/issues/5645 macosx-all
 runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java https://github.com/adoptium/aqa-tests/issues/5645 macosx-all
-#runtime/jni/nativeStack/TestNativeStack.java https://bugs.openjdk.org/browse/JDK-8311092 linux-arm
-runtime/jni/nativeStack/TestNativeStack.java https://github.com/adoptium/aqa-tests/issues/5384 aix-all,linux-arm
+runtime/jni/nativeStack/TestNativeStack.java https://github.com/adoptium/aqa-tests/issues/5384 aix-all
 runtime/logging/loadLibraryTest/LoadLibraryTest.java https://github.com/adoptium/aqa-tests/issues/5378  windows-x86
 runtime/NMT/HugeArenaTracking.java https://github.com/adoptium/aqa-tests/issues/5384 aix-all
-runtime/NMT/SafepointPollingPages.java https://github.com/adoptium/aqa-tests/issues/5900 linux-arm
 runtime/os/TestHugePageDecisionsAtVMStartup.java#THP_enabled https://bugs.openjdk.org/browse/JDK-8324580 linux-all
 runtime/CDSCompressedKPtrs/XShareAuto.java https://github.com/adoptium/aqa-tests/issues/5671 windows-x86
 

openjdk/excludes/ProblemList_openjdk17-openj9.txt

@@ -34,7 +34,6 @@ java/beans/PropertyEditor/TestFontClass.java https://github.com/eclipse-openj9/o
 java/beans/PropertyEditor/TestFontClassJava.java https://github.com/eclipse-openj9/openj9/issues/20531 macosx-all
 java/beans/PropertyEditor/TestFontClassNull.java https://github.com/eclipse-openj9/openj9/issues/20531 macosx-all
 java/beans/PropertyEditor/TestFontClassValue.java https://github.com/eclipse-openj9/openj9/issues/20531 macosx-all
-java/beans/Beans/TypoInBeanDescription.java https://github.ibm.com/runtimes/backlog/issues/1589 aix-all
 
 ############################################################################
 
@@ -225,7 +224,6 @@ java/net/httpclient/websocket/PendingTextPongClose.java https://github.com/eclip
 # jdk_imageio
 
 javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java https://github.com/eclipse-openj9/openj9/issues/19527 windows-all
-javax/imageio/plugins/shared/ImageWriterCompressionTest.java https://github.com/eclipse-openj9/openj9/issues/14948 linux-s390x
 
 ############################################################################
 
@@ -416,7 +414,6 @@ java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java http
 java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java	https://github.com/eclipse-openj9/openj9/issues/3447	generic-all
 java/util/WeakHashMap/GCDuringIteration.java	https://github.com/adoptium/aqa-tests/issues/1297	generic-all
 java/util/zip/CloseInflaterDeflaterTest.java	https://github.com/eclipse-openj9/openj9/issues/14948	linux-s390x
-java/util/zip/DeflateIn_InflateOut.java https://github.com/eclipse-openj9/openj9/issues/14948 linux-s390x
 java/util/zip/ZipFile/TestCleaner.java	https://github.com/eclipse-openj9/openj9/issues/8872 	generic-all
 java/util/Random/RandomTestChiSquared.java	https://github.com/eclipse-openj9/openj9/issues/13202	generic-all
 java/util/Random/RandomTestBsi1999.java		https://github.com/eclipse-openj9/openj9/issues/13202	generic-all