Update Jenkinsfile post events

Signed-off-by: Prudhvi Godithi <[email protected]>
opensearch-project · Aug 6, 2024 · b42e19f · b42e19f
1 parent 97cbfaa
commit b42e19f
Show file tree

Hide file tree

Showing 4 changed files with 3,012 additions and 6 deletions.
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -346,16 +346,20 @@ pipeline {
                                     sh 'sleep 10'
                                     downloadBuildManifest(
                                         url: BUILD_MANIFEST_URL,
-                                        path: BUILD_MANIFEST
+                                        path: "manifests-osd-${env.BUILD_NUMBER}/${env.BUILD_MANIFEST}"
+                                        // path: BUILD_MANIFEST
                                     )
                                     downloadBuildManifest(
                                         url: BUILD_MANIFEST_URL_OPENSEARCH,
-                                        path: BUILD_MANIFEST_OPENSEARCH
+                                        path: "manifests-osd-${env.BUILD_NUMBER}/${env.BUILD_MANIFEST_OPENSEARCH}"
+                                        // path: BUILD_MANIFEST_OPENSEARCH
                                     )
                                     createUploadTestReportManifest(
                                         testManifest: "manifests/${TEST_MANIFEST}",
-                                        buildManifest: BUILD_MANIFEST_OPENSEARCH,
-                                        dashboardsBuildManifest: BUILD_MANIFEST,
+                                        buildManifest: "manifests-osd-${env.BUILD_NUMBER}/${env.BUILD_MANIFEST_OPENSEARCH}",
+                                        dashboardsBuildManifest: "manifests-osd-${env.BUILD_NUMBER}/${env.BUILD_MANIFEST}",
+                                        // buildManifest: BUILD_MANIFEST_OPENSEARCH,
+                                        // dashboardsBuildManifest: BUILD_MANIFEST,
                                         testRunID: "${env.BUILD_NUMBER}",
                                         testType: "integ-test",
                                         componentName: "${COMPONENT_NAME}",

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -300,11 +300,11 @@ pipeline {
                                     sh 'sleep 10'
                                     downloadBuildManifest(
                                         url: BUILD_MANIFEST_URL,
-                                        path: BUILD_MANIFEST
+                                        path: "manifests-os-${env.BUILD_NUMBER}/${env.BUILD_MANIFEST}"
                                     )
                                     createUploadTestReportManifest(
                                         testManifest: "manifests/${TEST_MANIFEST}",
-                                        buildManifest: BUILD_MANIFEST,
+                                        buildManifest: "manifests-os-${env.BUILD_NUMBER}/${BUILD_MANIFEST}",
                                         testRunID: "${env.BUILD_NUMBER}",
                                         testType: 'integ-test',
                                         componentName: "${COMPONENT_NAME}",
@@ -313,6 +313,7 @@ pipeline {
                                     archiveArtifacts artifacts: 'test-report.yml'
                                 }
                             }
+                            postCleanup()
                         }
                         node(agent_nodes['linux_x64']) {
                             def rc = (params.RC_NUMBER.toInteger() > 0)