Skip to content

Commit 839c2ee

Browse files
sophia-guojiekang
sophia-guo
and
jiekang
authored
[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]>
1 parent 5a9e525 commit 839c2ee

File tree

20 files changed

+57
-49
lines changed

20 files changed

+57
-49
lines changed

Diff for: ‎buildenv/jenkins/JenkinsfileBase

+20-19
Original file line numberDiff line numberDiff line change
@@ -1189,44 +1189,45 @@ def addGrinderLink() {
11891189
def labelValue = ""
11901190
def targetValue = ""
11911191
def customTargetKeyValue = ""
1192-
def rerunIterations = ""
11931192
def urlParams = params.findAll {
11941193
// Exclude separator and help text parameters from url
11951194
!(it.key.endsWith('_PARAMS') || it.key.endsWith('_HELP_TEXT'))
11961195
}
11971196
urlParams.each { key, value ->
11981197
value = URLEncoder.encode(value.toString(), "UTF-8")
1199-
url += "${key}=${value}"
1200-
if (i != urlParams.size()) {
1201-
url += "&amp;"
1202-
}
1203-
i++;
1204-
if ( key == "LABEL" ) {
1198+
if (key == "LABEL") {
12051199
labelValue = "LABEL=${value}"
12061200
}
1207-
if ( key == "TARGET" ) {
1201+
if (key == "TARGET") {
12081202
targetValue = "TARGET=${value}"
12091203
}
1210-
if ( key == "CUSTOM_TARGET") {
1204+
if (key == "CUSTOM_TARGET") {
12111205
customTargetKeyValue = "CUSTOM_TARGET=${value}"
12121206
}
1213-
if ( key == "RERUN_ITERATIONS") {
1214-
rerunIterations = "RERUN_ITERATIONS=${value}"
1207+
// Always set RERUN_ITERATIONS to 0 for Grinder link
1208+
if (key == "RERUN_ITERATIONS") {
1209+
value = "0"
1210+
}
1211+
// Always set LightWeightCheckout to false for Grinder link
1212+
if (key == "LIGHT_WEIGHT_CHECKOUT") {
1213+
value = "false"
1214+
}
1215+
// Always set Parallel to None for Grinder link
1216+
if (key == "PARALLEL") {
1217+
value = "None"
12151218
}
12161219

1220+
url += "${key}=${value}"
1221+
if (i != urlParams.size()) {
1222+
url += "&amp;"
1223+
}
1224+
i++;
12171225
}
1226+
12181227
env.RERUN_LINK = url
12191228
env.FAILED_TEST_TARGET = targetValue
12201229
env.CUSTOM_TARGET_KEY_VALUE = customTargetKeyValue
12211230

1222-
// reset RERUN_ITERATIONS to 0 in Rerun in Grinder link
1223-
if (rerunIterations) {
1224-
url = url.replace(rerunIterations,"RERUN_ITERATIONS=0")
1225-
}
1226-
1227-
// reset LIGHT_WEIGHT_CHECKOUT to false in Rerun in Grinder link
1228-
url = url.replace("LIGHT_WEIGHT_CHECKOUT=true", "LIGHT_WEIGHT_CHECKOUT=false")
1229-
12301231
currentBuild.description += "<br><a href=\"https://github.com/adoptium/aqa-tests/wiki/How-to-Run-a-Grinder-Build-on-Jenkins\">Grinder Wiki</a>"
12311232
echo "Rerun in Grinder: ${url}"
12321233
currentBuild.description += "<br><a href=${url}>Rerun in Grinder</a> Change TARGET to run only the failed test targets."

Diff for: ‎external/build.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525
<property environment="env" />
2626
<property name="top" location="../" />
2727

28+
<set-property name="DOCKERIMAGE_TAG_ISSET" if-property-isset="env.DOCKERIMAGE_TAG"/>
29+
<set-property name="EXTRA_DOCKER_ARGS_ISSET" if-property-isset="env.EXTRA_DOCKER_ARGS"/>
2830
<if>
29-
<isset property="env.DOCKERIMAGE_TAG"/>
31+
<isset property="DOCKERIMAGE_TAG_ISSET"/>
3032
<then>
3133
<property name="dockerImageTag" value="${env.DOCKERIMAGE_TAG}"/>
3234
</then>
@@ -35,7 +37,7 @@
3537
</else>
3638
</if>
3739
<if>
38-
<isset property="env.EXTRA_DOCKER_ARGS"/>
40+
<isset property="EXTRA_DOCKER_ARGS_ISSET"/>
3941
<then>
4042
<property name="extra_docker_args" value="${env.EXTRA_DOCKER_ARGS}"/>
4143
</then>

Diff for: ‎external/build_image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function build_image() {
6767
echo "The test in the build_image() function is ${test}"
6868
# Used for tagging the image
6969
tags="adoptopenjdk-${test}-test:${version}-${package}-${os}-${vm}-${build}"
70-
if [[ "$test" == *"criu"* || "$test" == *"tck"* ]]; then
70+
if [[ "$test" == *"criu"* || "$test" == tck-* ]]; then
7171
container_build="sudo podman build"
7272
fi
7373

Diff for: ‎external/camel/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>camel_test</testCaseName>
18-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir camel --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
18+
<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)"; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir camel
2121
</command>

Diff for: ‎external/elasticsearch/playlist.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</disable>
2222
</disables>
2323
<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" \
24-
--reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
24+
--reportsrc /testResults/testJunit --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
2525
$(TEST_STATUS); \
2626
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch
2727
</command>
@@ -42,7 +42,7 @@
4242
<test>
4343
<testCaseName>elasticsearch_test_openj9_latest</testCaseName>
4444
<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" \
45-
--reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
45+
--reportsrc /testResults/testJunit --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
4646
$(TEST_STATUS); \
4747
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch
4848
</command>
@@ -62,7 +62,7 @@
6262
</test>
6363
<test>
6464
<testCaseName>elasticsearch_test_hotspot</testCaseName>
65-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
65+
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch --reportsrc /testResults/testJunit --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
6666
$(TEST_STATUS); \
6767
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir elasticsearch
6868
</command>

Diff for: ‎external/external.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ parseCommandLineArgs() {
128128
docker_os=ubi
129129
fi
130130

131-
if [[ "${test}" == *"criu"* || "${test}" == *"tck"* ]]; then
131+
if [[ "${test}" == *"criu"* || "${test}" == tck-* ]]; then
132132
container_run="sudo podman run"
133133
container_login="sudo podman login"
134134
container_inspect="sudo podman inspect"

Diff for: ‎external/external_custom/build.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
<!-- set properties for this build -->
1010
<property name="TEST" value="external_custom" />
1111
<property environment="env" />
12+
<set-property name="EXTERNAL_CUSTOM_REPO_ISSET" if-property-isset="env.EXTERNAL_CUSTOM_REPO"/>
13+
<set-property name="EXTERNAL_REPO_BRANCH_ISSET" if-property-isset="env.EXTERNAL_REPO_BRANCH"/>
14+
<set-property name="EXTERNAL_TEST_CMD_ISSET" if-property-isset="env.EXTERNAL_TEST_CMD"/>
1215
<condition property="EXTERNAL_CUSTOM_REPO" value="${env.EXTERNAL_CUSTOM_REPO}" else="">
13-
<isset property="env.EXTERNAL_CUSTOM_REPO" />
16+
<isset property="EXTERNAL_CUSTOM_REPO_ISSET" />
1417
</condition>
1518
<condition property="EXTERNAL_REPO_BRANCH" value="${env.EXTERNAL_REPO_BRANCH}" else="master">
16-
<isset property="env.EXTERNAL_REPO_BRANCH" />
19+
<isset property="EXTERNAL_REPO_BRANCH_ISSET" />
1720
</condition>
1821
<condition property="EXTERNAL_TEST_CMD" value="${env.EXTERNAL_TEST_CMD}" else="mvn clean install">
19-
<isset property="env.EXTERNAL_TEST_CMD" />
22+
<isset property="EXTERNAL_TEST_CMD_ISSET" />
2023
</condition>
2124
<property name="DEST" value="${BUILD_ROOT}/external/${TEST}" />
2225
<property name="src" location="." />

Diff for: ‎external/external_custom/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<test>
1818
<testCaseName>external_custom</testCaseName>
19-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag ${DOCKERIMAGE_TAG} --dir external_custom --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
19+
<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)" ; \
2020
$(TEST_STATUS); \
2121
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag ${DOCKERIMAGE_TAG} --dir external_custom
2222
</command>

Diff for: ‎external/jacoco/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>jacoco_test</testCaseName>
18-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir jacoco --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
18+
<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)"; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir jacoco
2121
</command>

Diff for: ‎external/jacoco/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mvn --batch-mode --fail-at-end $excludeProject clean verify
2828
test_exit_code=$?
2929
echo "Build jacoco completed"
3030

31-
find ./ -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
31+
find / -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
3232
echo "Test results copied"
3333

3434
exit $test_exit_code

Diff for: ‎external/jenkins/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>jenkins_test</testCaseName>
18-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir jenkins --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
18+
<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)"; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir jenkins
2121
</command>

Diff for: ‎external/payara-mp-tck/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</disable>
2222
</disables>
2323
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir payara-mp-tck \
24-
--reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
24+
--reportsrc /testResults/junitreports --reportsrc /testResults/surefire-reports --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
2525
$(TEST_STATUS); \
2626
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir payara-mp-tck
2727
</command>

Diff for: ‎external/quarkus/playlist.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<impl>openj9</impl>
2828
</disable>
2929
</disables>
30-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
30+
<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)"; \
3131
$(TEST_STATUS); \
3232
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir quarkus
3333
</command>
@@ -48,7 +48,7 @@
4848
<comment>https://github.com/adoptium/temurin-build/issues/767</comment>
4949
</disable>
5050
</disables>
51-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir quarkus --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)"; \
51+
<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)"; \
5252
$(TEST_STATUS); \
5353
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir quarkus
5454
</command>

Diff for: ‎external/quarkus_quickstarts/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>quarkus_quickstarts_test</testCaseName>
18-
<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)"; \
18+
<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)"; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir quarkus_quickstarts
2121
</command>

Diff for: ‎external/tomee/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>tomee_test_j9</testCaseName>
18-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir tomee --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
18+
<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)" ; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir tomee
2121
</command>

Diff for: ‎external/tomee/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ echo "Run Microprofile TCK"
2727
cd tck/microprofile-tck
2828
mvn --batch-mode test -Denforcer.fail=false
2929
test_exit_code=$?
30-
find ./ -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
30+
find / -type d -name 'surefire-reports' -exec cp -r "{}" /testResults \;
3131
exit $test_exit_code

Diff for: ‎external/wycheproof/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>wycheproof_test</testCaseName>
18-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir wycheproof --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
18+
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir wycheproof --reportsrc /testResults/testlogs --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir wycheproof
2121
</command>

Diff for: ‎external/zookeeper/playlist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TKG/resources/playlist.xsd">
1616
<test>
1717
<testCaseName>zookeeper_test</testCaseName>
18-
<command> $(TEST_ROOT)$(D)external$(D)external.sh --run --tag "${DOCKERIMAGE_TAG}" --dir zookeeper --reportdst $(REPORTDIR) --docker_args "$(EXTRA_DOCKER_ARGS)" ; \
18+
<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)" ; \
1919
$(TEST_STATUS); \
2020
$(TEST_ROOT)$(D)external$(D)external.sh --clean --tag "${DOCKERIMAGE_TAG}" --dir zookeeper
2121
</command>

Diff for: ‎functional/OpenJcePlusTests/build.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,19 @@
3535
<available file="OpenJCEPlus" type="dir"/>
3636
</condition>
3737
</target>
38-
38+
<set-property name="OPENJCEPLUS_GIT_REPO_ISSET" if-property-isset="env.OPENJCEPLUS_GIT_REPO"/>
3939
<if>
40-
<isset property="env.OPENJCEPLUS_GIT_REPO"/>
40+
<isset property="OPENJCEPLUS_GIT_REPO_ISSET"/>
4141
<then>
4242
<property name="openjceplusGitRepo" value="${env.OPENJCEPLUS_GIT_REPO}"/>
4343
</then>
4444
<else>
4545
<property name="openjceplusGitRepo" value="https://github.com/ibmruntimes/OpenJCEPlus.git"/>
4646
</else>
4747
</if>
48+
<set-property name="OPENJCEPLUS_GIT_BRANCH_ISSET" if-property-isset="env.OPENJCEPLUS_GIT_BRANCH"/>
4849
<if>
49-
<isset property="env.OPENJCEPLUS_GIT_BRANCH"/>
50+
<isset property="OPENJCEPLUS_GIT_BRANCH_ISSET"/>
5051
<then>
5152
<property name="openjceplusGitBranch" value="${env.OPENJCEPLUS_GIT_BRANCH}"/>
5253
</then>

Diff for: ‎jck/build.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@
3737
<condition property="src-encoding" value="IBM-1047" else="UTF-8">
3838
<isset property="isZOS"/>
3939
</condition>
40-
40+
41+
<set-property name="JCK_GIT_BRANCH_ISSET" if-property-isset="env.JCK_GIT_BRANCH"/>
4142
<condition property="jck_branch" value="${env.JCK_GIT_BRANCH}" else="main">
42-
<isset property="env.JCK_GIT_BRANCH"/>
43+
<isset property="JCK_GIT_BRANCH_ISSET"/>
4344
</condition>
4445

4546
<property name="jtrunner_src_dir" value="${TEST_ROOT}/jck/jtrunner"/>
@@ -346,9 +347,9 @@
346347
<property name="JCK_ROOT_USED" location="${JCK_ROOT_RELATIVE_PATH}"/>
347348

348349
<echo>=== JCK_ROOT_USED is set to ${JCK_ROOT_USED} ===</echo>
349-
350+
<set-property name="JCK_VERSION_ISSET" if-property-isset="env.JCK_VERSION"/>
350351
<if>
351-
<isset property="env.JCK_VERSION" />
352+
<isset property="JCK_VERSION_ISSET" />
352353
<then>
353354
<property name="JCK_VERSION_USED" value="${env.JCK_VERSION}" />
354355
</then>

0 commit comments

Comments
 (0)