From 9a7413c889a036a5fb38a803d4a14678ca25ecee Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Tue, 3 Dec 2024 10:50:41 -0500
Subject: [PATCH] support surefire or junit reports

---
 external/camel/playlist.xml               | 2 +-
 external/elasticsearch/playlist.xml       | 6 +++---
 external/external_custom/playlist.xml     | 2 +-
 external/jacoco/playlist.xml              | 2 +-
 external/jacoco/test.sh                   | 2 +-
 external/jenkins/playlist.xml             | 2 +-
 external/payara-mp-tck/playlist.xml       | 2 +-
 external/quarkus/playlist.xml             | 4 ++--
 external/quarkus_quickstarts/playlist.xml | 2 +-
 external/tomee/playlist.xml               | 2 +-
 external/tomee/test.sh                    | 2 +-
 external/wycheproof/playlist.xml          | 2 +-
 external/zookeeper/playlist.xml           | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/external/camel/playlist.xml b/external/camel/playlist.xml
index 186f3471fe..aeabd79990 100644
--- 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
index 1a044f8492..1e2d4ad49b 100644
--- 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_custom/playlist.xml b/external/external_custom/playlist.xml
index 735cf704b2..b714f20ca0 100644
--- 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
index dc2701760a..396e99ace8 100644
--- 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
index 81989e24e3..22257afe32 100644
--- 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
\ No newline at end of file
diff --git a/external/jenkins/playlist.xml b/external/jenkins/playlist.xml
index 60b455f019..38e4f163b8 100644
--- 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
index a581d1b1dd..615b03ba1c 100644
--- 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
index 6ce0112c03..36015edc05 100644
--- 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
index 835e950d2c..9c1670d2a7 100644
--- 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
index 34e60457eb..422619ee5b 100644
--- 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
index 3bf0942f96..c983fceaf1 100644
--- 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
\ No newline at end of file
diff --git a/external/wycheproof/playlist.xml b/external/wycheproof/playlist.xml
index 54103281a1..d738f4dd11 100644
--- 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
index 83dad9e292..67a05effa1 100644
--- 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>