Merge pull request javaee-samples#28 from payara/DEVOPS-795

Cuba Stanley · web-flow · commit 547b8cf601f9 · 2022-11-11T10:34:25.000Z
Fix post step
diff --git a/.jenkins/modules/Test/Test.groovy b/.jenkins/modules/Test/Test.groovy
@@ -3,8 +3,9 @@ MPLPostStep('always') {
 }
 
 MPLPostStep('failure') {
-    echo "There are test failures, archiving server log"
-    archiveArtifacts artifacts: "./${getPayaraDirectoryName}/glassfish/domains/${getDomainName()}/logs/server.log"
+    echo "There are test failures, archiving server logs to ${CFG.suite.suite_name}-Logs.zip"
+    sh "cp -R ./${getPayaraDirectoryName(CFG.'build.version')}/glassfish/domains/${CFG.domain_name}/logs ./${CFG.suite.suite_name}-Logs"
+    archiveArtifacts artifacts: "${CFG.suite.suite_name}-Logs/**/*.*"
 }
 
 withMaven(jdk: CFG.jdk, options: [artifactsPublisher(disabled: true)]) {

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@ MPLPostStep('always') {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`MPLPostStep('failure') {`
`6`		`- echo "There are test failures, archiving server log"`
`7`		`- archiveArtifacts artifacts: "./${getPayaraDirectoryName}/glassfish/domains/${getDomainName()}/logs/server.log"`
	`6`	`+ echo "There are test failures, archiving server logs to ${CFG.suite.suite_name}-Logs.zip"`
	`7`	`+ sh "cp -R ./${getPayaraDirectoryName(CFG.'build.version')}/glassfish/domains/${CFG.domain_name}/logs ./${CFG.suite.suite_name}-Logs"`
	`8`	`+ archiveArtifacts artifacts: "${CFG.suite.suite_name}-Logs/*/.*"`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`withMaven(jdk: CFG.jdk, options: [artifactsPublisher(disabled: true)]) {`