This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 0d14be92444f44efa22a6d30d5300f25570853ae Author: Ben Weidig <[email protected]> AuthorDate: Sun Apr 12 16:51:43 2026 +0200 TAP5-2819: Jenkinsfile try to improve test result splitting in matrix builds --- Jenkinsfile | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dd10d25e8..1965762bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,29 +47,23 @@ pipeline { } post { always { - // Prefix the classnames for JUnit and TestNG results - sh """ - find . -path '*/build/test-results/**/*.xml' \ - -not -path '*/matrix-artifacts/*' -exec \ - sed -i 's/classname="/classname="${JDK_VERSION}./g' {} + - """ - - junit( - testResults: '**/build/test-results/test/**/*.xml', - allowEmptyResults: true - ) - - // Copy reports into a JDK-named folder to avoid overwriting between matrix cells. - // Using ./build/ so it gets cleaned automatically by ./gradlew clean. + // Copy all reports and test results into a matrix-named folder sh """ find . \\( -path '*/build/reports' -o -path '*/build/test-results' \\) \ - -not -path './build/matrix-artifacts/*' -type d | while IFS= read -r src; do + -not -path './build/matrix-artifacts/*' -type d | while IFS= read -r src; do dest="build/matrix-artifacts/${JDK_VERSION}/\${src#./}" mkdir -p -- "\$dest" cp -r -- "\$src/." "\$dest/" done """ + // Point JUnit to the XMLs inside the new folder + junit( + testResults: "build/matrix-artifacts/${JDK_VERSION}/**/test-results/**/*.xml", + allowEmptyResults: true + ) + + // Archive matrix artifacts archiveArtifacts( artifacts: "build/matrix-artifacts/${JDK_VERSION}/**/*", allowEmptyArchive: true
