fix archive path

vanajamukkara · vanajamukkara · commit cb0798d48c2d · 2023-08-01T20:02:49.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -630,7 +630,8 @@ EOF
                                 mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
                                 sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
                             '''
-                            archiveArtifacts(artifacts: "logdir/**/*")
+                            archiveArtifacts(artifacts:
+                            "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/**/*,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/**/*")
                             junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)
                         }
                     }
diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly
@@ -597,7 +597,8 @@ EOF
                                 mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
                                 sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
                             '''
-                            archiveArtifacts(artifacts: "logdir/**/*")
+                            archiveArtifacts(artifacts:
+                            "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/**/*,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/**/*")
                             junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)
                         }
                     }
diff --git a/Jenkinsfile.oke b/Jenkinsfile.oke
@@ -571,7 +571,8 @@ EOF
                                 sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
                                 ${WORKSPACE}/terraform/oke.delete.sh ${OCI_PROP_FILE} ${WORKSPACE}/terraform
                             '''
-                            archiveArtifacts(artifacts: "logdir/**/*")
+                            archiveArtifacts(artifacts:
+                            "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/**/*,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/**/*")
                             junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,8 @@ EOF`
`630`	`630`	`mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`631`	`631`	`sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`632`	`632`	`'''`
`633`		`- archiveArtifacts(artifacts: "logdir/*/")`
	`633`	`+ archiveArtifacts(artifacts:`
	`634`	`+ "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/*/,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/*/")`
`634`	`635`	`junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)`
`635`	`636`	`}`
`636`	`637`	`}`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,8 @@ EOF`
`597`	`597`	`mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`598`	`598`	`sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`599`	`599`	`'''`
`600`		`- archiveArtifacts(artifacts: "logdir/*/")`
	`600`	`+ archiveArtifacts(artifacts:`
	`601`	`+ "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/*/,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/*/")`
`601`	`602`	`junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)`
`602`	`603`	`}`
`603`	`604`	`}`
Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,8 @@ EOF`
`571`	`571`	`sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`572`	`572`	`${WORKSPACE}/terraform/oke.delete.sh ${OCI_PROP_FILE} ${WORKSPACE}/terraform`
`573`	`573`	`'''`
`574`		`- archiveArtifacts(artifacts: "logdir/*/")`
	`574`	`+ archiveArtifacts(artifacts:`
	`575`	`+ "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/*/,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/*/")`
`575`	`576`	`junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)`
`576`	`577`	`}`
`577`	`578`	`}`