[v1.0.5-release] cherry-pick #5796 #5800 #5822 #5829 (#5875)

* support surefire or junit reports (#5796) * Enhance the environment variable check (#5800) Check environment variable as set only if it's not empty. Signed-off-by: Sophia Guo <[email protected]> * non tck ones not limited to use podman (#5822) * Adjust Grinder link to properly rerun with 0 iterations and always rerun with parallel=none (#5829) * Adjust Grinder link to properly rerun with 0 iterations and always rerun with parallel=none * Fix Parallel value to 'None' and revert change of order for declaring env variables --------- Signed-off-by: Sophia Guo <[email protected]> Co-authored-by: Jie Kang <[email protected]>
adoptium · Jan 16, 2025 · 839c2ee · 839c2ee
1 parent 5a9e525
commit 839c2ee
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 49 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -1189,44 +1189,45 @@ def addGrinderLink() {
 	def labelValue = ""
 	def targetValue = ""
 	def customTargetKeyValue = ""
-	def rerunIterations = ""
 	def urlParams = params.findAll {
 		// Exclude separator and help text parameters from url
 		!(it.key.endsWith('_PARAMS') || it.key.endsWith('_HELP_TEXT'))
 	}
 	urlParams.each { key, value ->
 		value = URLEncoder.encode(value.toString(), "UTF-8")
-		url += "${key}=${value}"
-		if (i != urlParams.size()) {
-			url += "&amp;"
-		}
-		i++;
-		if ( key == "LABEL" ) {
+		if (key == "LABEL") {
 			labelValue = "LABEL=${value}"
 		}
-		if ( key == "TARGET" ) {
+		if (key == "TARGET") {
 			targetValue = "TARGET=${value}"
 		}
-		if ( key == "CUSTOM_TARGET") {
+		if (key == "CUSTOM_TARGET") {
 			customTargetKeyValue = "CUSTOM_TARGET=${value}"
 		}
-		if ( key == "RERUN_ITERATIONS") {
-			rerunIterations = "RERUN_ITERATIONS=${value}"
+		// Always set RERUN_ITERATIONS to 0 for Grinder link
+		if (key == "RERUN_ITERATIONS") {
+			value = "0"
+		}
+		// Always set LightWeightCheckout to false for Grinder link
+		if (key == "LIGHT_WEIGHT_CHECKOUT") {
+			value = "false"
+		}
+		// Always set Parallel to None for Grinder link
+		if (key == "PARALLEL") {
+			value = "None"
 		}
 
+		url += "${key}=${value}"
+		if (i != urlParams.size()) {
+			url += "&amp;"
+		}
+		i++;
 	}
+
 	env.RERUN_LINK = url
 	env.FAILED_TEST_TARGET = targetValue
 	env.CUSTOM_TARGET_KEY_VALUE = customTargetKeyValue
 
-	// reset RERUN_ITERATIONS to 0 in Rerun in Grinder link
-	if (rerunIterations) {
-		url = url.replace(rerunIterations,"RERUN_ITERATIONS=0")
-	}
-
-	// reset LIGHT_WEIGHT_CHECKOUT to false in Rerun in Grinder link
-	url = url.replace("LIGHT_WEIGHT_CHECKOUT=true", "LIGHT_WEIGHT_CHECKOUT=false")
-
 	currentBuild.description += "<br><a href=\"https://github.com/adoptium/aqa-tests/wiki/How-to-Run-a-Grinder-Build-on-Jenkins\">Grinder Wiki</a>"
 	echo "Rerun in Grinder: ${url}"
 	currentBuild.description += "<br><a href=${url}>Rerun in Grinder</a> Change TARGET to run only the failed test targets."

diff --git a/external/build.xml b/external/build.xml
@@ -25,8 +25,10 @@
 	<property environment="env" />
 	<property name="top" location="../" />
 
+	<set-property name="DOCKERIMAGE_TAG_ISSET" if-property-isset="env.DOCKERIMAGE_TAG"/>
+	<set-property name="EXTRA_DOCKER_ARGS_ISSET" if-property-isset="env.EXTRA_DOCKER_ARGS"/>
 	<if>
-		<isset property="env.DOCKERIMAGE_TAG"/>
+		<isset property="DOCKERIMAGE_TAG_ISSET"/>
 		<then>
 			<property name="dockerImageTag" value="${env.DOCKERIMAGE_TAG}"/>
 		</then>
@@ -35,7 +37,7 @@
 		</else>
 	</if>
 	<if>
-		<isset property="env.EXTRA_DOCKER_ARGS"/>
+		<isset property="EXTRA_DOCKER_ARGS_ISSET"/>
 		<then>
 			<property name="extra_docker_args" value="${env.EXTRA_DOCKER_ARGS}"/>
 		</then>

diff --git a/external/build_image.sh b/external/build_image.sh
@@ -67,7 +67,7 @@ function build_image() {
 	echo "The test in the build_image() function is ${test}"
     # Used for tagging the image
     tags="adoptopenjdk-${test}-test:${version}-${package}-${os}-${vm}-${build}"
-	if [[ "$test" == *"criu"* || "$test" == *"tck"* ]]; then
+	if [[ "$test" == *"criu"* || "$test" == tck-* ]]; then
 		container_build="sudo podman build"
 	fi
 

diff --git a/external/camel/playlist.xml b/external/camel/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>camel_test</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir camel --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir camel --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir camel
 		</command>

diff --git a/external/elasticsearch/playlist.xml b/external/elasticsearch/playlist.xml
@@ -21,7 +21,7 @@
 			</disable>
 		</disables>
 		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch --testtarget "--exclude-task :core:test --exclude-task :client:rest:test --exclude-task :modules:reindex:test --exclude-task :client:transport:test --exclude-task :client:sniffer:test --exclude-task :test:framework:test --exclude-task :modules:lang-painless:test" \
-		--reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		--reportsrc /testResults/testJunit --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch
 		</command>
@@ -42,7 +42,7 @@
 	<test>
 		<testCaseName>elasticsearch_test_openj9_latest</testCaseName>
 		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch --testtarget "--exclude-task :client:rest:test --exclude-task :modules:reindex:test --exclude-task :client:transport:test --exclude-task :client:sniffer:test --exclude-task :test:framework:test --exclude-task :modules:lang-painless:test" \
-		--reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		--reportsrc /testResults/testJunit --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch
 		</command>
@@ -62,7 +62,7 @@
 	</test>
 	<test>
 		<testCaseName>elasticsearch_test_hotspot</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch --reportsrc /testResults/testJunit --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch
 		</command>

diff --git a/external/external.sh b/external/external.sh
@@ -128,7 +128,7 @@ parseCommandLineArgs() {
 					docker_os=ubi
 				fi
 
-				if [[ "${test}" == *"criu"* || "${test}" == *"tck"* ]]; then
+				if [[ "${test}" == *"criu"* || "${test}" == tck-* ]]; then
 					container_run="sudo podman run"
 					container_login="sudo podman login"
 					container_inspect="sudo podman inspect"

diff --git a/external/external_custom/build.xml b/external/external_custom/build.xml
@@ -9,14 +9,17 @@
 	<!-- set properties for this build -->
 	<property name="TEST" value="external_custom" />
 	<property environment="env" />
+	<set-property name="EXTERNAL_CUSTOM_REPO_ISSET" if-property-isset="env.EXTERNAL_CUSTOM_REPO"/>
+	<set-property name="EXTERNAL_REPO_BRANCH_ISSET" if-property-isset="env.EXTERNAL_REPO_BRANCH"/>
+	<set-property name="EXTERNAL_TEST_CMD_ISSET" if-property-isset="env.EXTERNAL_TEST_CMD"/>
 	<condition property="EXTERNAL_CUSTOM_REPO" value="${env.EXTERNAL_CUSTOM_REPO}" else="">
-		<isset property="env.EXTERNAL_CUSTOM_REPO" />
+		<isset property="EXTERNAL_CUSTOM_REPO_ISSET" />
 	</condition>
 	<condition property="EXTERNAL_REPO_BRANCH" value="${env.EXTERNAL_REPO_BRANCH}" else="master">
-		<isset property="env.EXTERNAL_REPO_BRANCH" />
+		<isset property="EXTERNAL_REPO_BRANCH_ISSET" />
 	</condition>
 	<condition property="EXTERNAL_TEST_CMD" value="${env.EXTERNAL_TEST_CMD}" else="mvn clean install">
-		<isset property="env.EXTERNAL_TEST_CMD" />
+		<isset property="EXTERNAL_TEST_CMD_ISSET" />
 	</condition>
 	<property name="DEST" value="${BUILD_ROOT}/external/${TEST}" />
 	<property name="src" location="." />

diff --git a/external/external_custom/playlist.xml b/external/external_custom/playlist.xml
@@ -16,7 +16,7 @@
 
 	<test>
 		<testCaseName>external_custom</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag ${DOCKERIMAGE_TAG} --dir external_custom --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag ${DOCKERIMAGE_TAG} --dir external_custom --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag ${DOCKERIMAGE_TAG} --dir external_custom
 		</command>

diff --git a/external/jacoco/playlist.xml b/external/jacoco/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>jacoco_test</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir jacoco --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir jacoco --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir jacoco 
 		</command>

diff --git a/external/jacoco/test.sh b/external/jacoco/test.sh
@@ -28,7 +28,7 @@ mvn --batch-mode --fail-at-end $excludeProject clean verify
 test_exit_code=$?
 echo "Build jacoco completed"
 
-find ./ -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
+find / -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
 echo "Test results copied"
 
 exit $test_exit_code
diff --git a/external/jenkins/playlist.xml b/external/jenkins/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>jenkins_test</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir jenkins --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir jenkins --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir jenkins
 		</command>

diff --git a/external/payara-mp-tck/playlist.xml b/external/payara-mp-tck/playlist.xml
@@ -21,7 +21,7 @@
 			</disable>
 		</disables>
 		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir payara-mp-tck \
-		--reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		--reportsrc /testResults/junitreports --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir payara-mp-tck
 		</command>

diff --git a/external/quarkus/playlist.xml b/external/quarkus/playlist.xml
@@ -27,7 +27,7 @@
 				<impl>openj9</impl>
 			</disable>
 		</disables>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir quarkus
 		</command>
@@ -48,7 +48,7 @@
 				<comment>https://github.com/adoptium/temurin-build/issues/767</comment>
 			</disable>
 		</disables>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir quarkus
 		</command>

diff --git a/external/quarkus_quickstarts/playlist.xml b/external/quarkus_quickstarts/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>quarkus_quickstarts_test</testCaseName>
-		<command>$(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus_quickstarts --reportdst $(REPORTDIR) --docker_args "-v /var/run/docker.sock:/var/run/docker.sock $(EXTRA_DOCKER_ARGS)"; \
+		<command>$(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus_quickstarts --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "-v /var/run/docker.sock:/var/run/docker.sock $(EXTRA_DOCKER_ARGS)"; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir quarkus_quickstarts 
 		</command>

diff --git a/external/tomee/playlist.xml b/external/tomee/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>tomee_test_j9</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir tomee --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir tomee --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir tomee
 		</command>

diff --git a/external/tomee/test.sh b/external/tomee/test.sh
@@ -27,5 +27,5 @@ echo "Run Microprofile TCK"
 cd tck/microprofile-tck
 mvn --batch-mode test -Denforcer.fail=false
 test_exit_code=$?
-find ./ -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
+find / -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
 exit $test_exit_code
diff --git a/external/wycheproof/playlist.xml b/external/wycheproof/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>wycheproof_test</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir wycheproof --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir wycheproof --reportsrc /testResults/testlogs --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 		$(TEST_STATUS); \
 		$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir wycheproof
 		</command>

diff --git a/external/zookeeper/playlist.xml b/external/zookeeper/playlist.xml
@@ -15,7 +15,7 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
 	<test>
 		<testCaseName>zookeeper_test</testCaseName>
-		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir zookeeper --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
+		<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir zookeeper --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
 			$(TEST_STATUS); \
 			$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir zookeeper
 		</command>

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
@@ -35,18 +35,19 @@
 			<available file="OpenJCEPlus" type="dir"/>
 		</condition>
 	</target>
-
+	<set-property name="OPENJCEPLUS_GIT_REPO_ISSET" if-property-isset="env.OPENJCEPLUS_GIT_REPO"/>
 	<if>
-		<isset property="env.OPENJCEPLUS_GIT_REPO"/>
+		<isset property="OPENJCEPLUS_GIT_REPO_ISSET"/>
 		<then>
 			<property name="openjceplusGitRepo" value="${env.OPENJCEPLUS_GIT_REPO}"/>
 		</then>
 		<else>
 			<property name="openjceplusGitRepo" value="https://github.com/ibmruntimes/OpenJCEPlus.git"/>
 		</else>
 	</if>
+	<set-property name="OPENJCEPLUS_GIT_BRANCH_ISSET" if-property-isset="env.OPENJCEPLUS_GIT_BRANCH"/>	
 	<if>
-		<isset property="env.OPENJCEPLUS_GIT_BRANCH"/>
+		<isset property="OPENJCEPLUS_GIT_BRANCH_ISSET"/>
 		<then>
 			<property name="openjceplusGitBranch" value="${env.OPENJCEPLUS_GIT_BRANCH}"/>
 		</then>

diff --git a/jck/build.xml b/jck/build.xml
@@ -37,9 +37,10 @@
 	<condition property="src-encoding" value="IBM-1047" else="UTF-8">
 		<isset property="isZOS"/>
 	</condition>
-
+
+	<set-property name="JCK_GIT_BRANCH_ISSET" if-property-isset="env.JCK_GIT_BRANCH"/>
 	<condition property="jck_branch" value="${env.JCK_GIT_BRANCH}" else="main">
-		<isset property="env.JCK_GIT_BRANCH"/>
+		<isset property="JCK_GIT_BRANCH_ISSET"/>
 	</condition>
 
 	<property name="jtrunner_src_dir" value="${TEST_ROOT}/jck/jtrunner"/>
@@ -346,9 +347,9 @@
 		<property name="JCK_ROOT_USED" location="${JCK_ROOT_RELATIVE_PATH}"/>
 
 		<echo>=== JCK_ROOT_USED is set to ${JCK_ROOT_USED} ===</echo>
-
+        <set-property name="JCK_VERSION_ISSET" if-property-isset="env.JCK_VERSION"/>
 		<if>
-			<isset property="env.JCK_VERSION" />
+			<isset property="JCK_VERSION_ISSET" />
 			<then>
 				<property name="JCK_VERSION_USED" value="${env.JCK_VERSION}" />
 			</then>