Add specific download path for downloadBuildManifest (#4921)

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
opensearch-project · Aug 6, 2024 · b35a2c7 · b35a2c7
1 parent af6dfbd
commit b35a2c7
Show file tree

Hide file tree

Showing 6 changed files with 209 additions and 201 deletions.
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -342,26 +342,28 @@ pipeline {
                         node(AGENT_LABEL) {
                             docker.withRegistry('https://public.ecr.aws/') {
                                 docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) {
-                                    checkout scm
-                                    sh 'sleep 10'
-                                    downloadBuildManifest(
-                                        url: BUILD_MANIFEST_URL,
-                                        path: BUILD_MANIFEST
-                                    )
-                                    downloadBuildManifest(
-                                        url: BUILD_MANIFEST_URL_OPENSEARCH,
-                                        path: BUILD_MANIFEST_OPENSEARCH
-                                    )
-                                    createUploadTestReportManifest(
-                                        testManifest: "manifests/${TEST_MANIFEST}",
-                                        buildManifest: BUILD_MANIFEST_OPENSEARCH,
-                                        dashboardsBuildManifest: BUILD_MANIFEST,
-                                        testRunID: "${env.BUILD_NUMBER}",
-                                        testType: "integ-test",
-                                        componentName: "${COMPONENT_NAME}",
-                                    )
-                                    echo("Download report manifest from https://ci.opensearch.org/ci/dbc/integ-test-opensearch-dashboards/${env.version}/${env.buildId}/${env.platform}/${env.architecture}/${env.distribution}/test-results/${env.BUILD_NUMBER}/integ-test/test-report.yml")
-                                    archiveArtifacts artifacts: 'test-report.yml'
+                                    dir ("manifests-osd-${env.BUILD_NUMBER}") { 
+                                        checkout scm
+                                        sh 'sleep 10'
+                                        downloadBuildManifest(
+                                            url: BUILD_MANIFEST_URL,
+                                            path: BUILD_MANIFEST
+                                        )
+                                        downloadBuildManifest(
+                                            url: BUILD_MANIFEST_URL_OPENSEARCH,
+                                            path: BUILD_MANIFEST_OPENSEARCH
+                                        )
+                                        createUploadTestReportManifest(
+                                            testManifest: "manifests/${TEST_MANIFEST}",
+                                            buildManifest: BUILD_MANIFEST_OPENSEARCH,
+                                            dashboardsBuildManifest: BUILD_MANIFEST,
+                                            testRunID: "${env.BUILD_NUMBER}",
+                                            testType: "integ-test",
+                                            componentName: "${COMPONENT_NAME}",
+                                        )
+                                        echo("Download report manifest from https://ci.opensearch.org/ci/dbc/integ-test-opensearch-dashboards/${env.version}/${env.buildId}/${env.platform}/${env.architecture}/${env.distribution}/test-results/${env.BUILD_NUMBER}/integ-test/test-report.yml")
+                                        archiveArtifacts artifacts: 'test-report.yml'
+                                    }
                                 }
                             }
                         }

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -296,21 +296,23 @@ pipeline {
                         node(AGENT_LABEL) {
                             docker.withRegistry('https://public.ecr.aws/') {
                                 docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) {
-                                    checkout scm
-                                    sh 'sleep 10'
-                                    downloadBuildManifest(
-                                        url: BUILD_MANIFEST_URL,
-                                        path: BUILD_MANIFEST
-                                    )
-                                    createUploadTestReportManifest(
-                                        testManifest: "manifests/${TEST_MANIFEST}",
-                                        buildManifest: BUILD_MANIFEST,
-                                        testRunID: "${env.BUILD_NUMBER}",
-                                        testType: 'integ-test',
-                                        componentName: "${COMPONENT_NAME}",
-                                    )
-                                    echo("Download report manifest from https://ci.opensearch.org/ci/dbc/integ-test/${env.version}/${env.buildId}/${env.platform}/${env.architecture}/${env.distribution}/test-results/${env.BUILD_NUMBER}/integ-test/test-report.yml")
-                                    archiveArtifacts artifacts: 'test-report.yml'
+                                    dir ("manifests-os-${env.BUILD_NUMBER}") {
+                                        checkout scm
+                                        sh 'sleep 10'
+                                        downloadBuildManifest(
+                                            url: BUILD_MANIFEST_URL,
+                                            path: BUILD_MANIFEST
+                                        )
+                                        createUploadTestReportManifest(
+                                            testManifest: "manifests/${TEST_MANIFEST}",
+                                            buildManifest: BUILD_MANIFEST,
+                                            testRunID: "${env.BUILD_NUMBER}",
+                                            testType: 'integ-test',
+                                            componentName: "${COMPONENT_NAME}",
+                                        )
+                                        echo("Download report manifest from https://ci.opensearch.org/ci/dbc/integ-test/${env.version}/${env.buildId}/${env.platform}/${env.architecture}/${env.distribution}/test-results/${env.BUILD_NUMBER}/integ-test/test-report.yml")
+                                        archiveArtifacts artifacts: 'test-report.yml'
+                                    }
                                 }
                             }
                         }