From 2961f821a193113bc1b55ea8adff0a67653101b0 Mon Sep 17 00:00:00 2001 From: Prudhvi Godithi Date: Tue, 6 Aug 2024 18:26:01 -0700 Subject: [PATCH] Update Jenkinsfile post actions Signed-off-by: Prudhvi Godithi --- .../integ-test.jenkinsfile | 24 +++++++++++-------- jenkins/opensearch/integ-test.jenkinsfile | 23 ++++++++++-------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 2415122d10..40d6c90526 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -353,17 +353,21 @@ pipeline { 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' } + checkout scm + sh 'sleep 5' + sh "cp manifests-osd-${env.BUILD_NUMBER}/${BUILD_MANIFEST} ." + sh "cp manifests-osd-${env.BUILD_NUMBER}/${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 index afe2a880fd..823472152f 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -297,22 +297,25 @@ pipeline { docker.withRegistry('https://public.ecr.aws/') { docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) { dir ("manifests-os-${env.BUILD_NUMBER}") { - checkout scm sh 'sleep 10' + checkout scm 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' } + checkout scm + sh 'sleep 5' + sh "cp manifests-os-${env.BUILD_NUMBER}/${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' } } }