fix archive path

vanajamukkara · vanajamukkara · commit 06a6c3667330 · 2023-08-01T20:17:30.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -575,7 +575,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
@@ -603,7 +603,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
@@ -579,7 +579,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
`@@ -575,7 +575,8 @@ EOF`
`575`	`575`	`mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`576`	`576`	`sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`577`	`577`	`'''`
`578`		`- archiveArtifacts(artifacts: "logdir/*/")`
	`578`	`+ archiveArtifacts(artifacts:`
	`579`	`+ "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/*/,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/*/")`
`579`	`580`	`junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)`
`580`	`581`	`}`
`581`	`582`	`}`
Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,8 @@ EOF`
`603`	`603`	`mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`604`	`604`	`sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`605`	`605`	`'''`
`606`		`- archiveArtifacts(artifacts: "logdir/*/")`
	`606`	`+ archiveArtifacts(artifacts:`
	`607`	`+ "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/*/,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/*/")`
`607`	`608`	`junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)`
`608`	`609`	`}`
`609`	`610`	`}`
Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,8 @@ EOF`
`579`	`579`	`sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"`
`580`	`580`	`${WORKSPACE}/terraform/oke.delete.sh ${OCI_PROP_FILE} ${WORKSPACE}/terraform`
`581`	`581`	`'''`
`582`		`- archiveArtifacts(artifacts: "logdir/*/")`
	`582`	`+ archiveArtifacts(artifacts:`
	`583`	`+ "logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/*/,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/*/")`
`583`	`584`	`junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)`
`584`	`585`	`}`
`585`	`586`	`}`