Publish Bug

Signed-off-by: Prudhvi Godithi <[email protected]>
prudhvigodithi · Jul 30, 2024 · 6ba6fe0 · 6ba6fe0
1 parent 6898b1e
commit 6ba6fe0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: '[email protected].1', retriever: modernSCM([
+lib = library(identifier: '[email protected].2', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -7,9 +7,9 @@
  * compatible open source license.
  */
 
-lib = library(identifier: 'jenkins@6.7.1', retriever: modernSCM([
+lib = library(identifier: 'jenkins@main', retriever: modernSCM([
     $class: 'GitSCMSource',
-    remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
+    remote: 'https://github.com/prudhvigodithi/opensearch-build-libraries.git',
 ]))
 
 def docker_images = [
@@ -342,6 +342,7 @@ pipeline {
                         node(AGENT_LABEL) {
                             docker.withRegistry('https://public.ecr.aws/') {
                                 docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) {
+                                    sh 'sleep 20'
                                     checkout scm
                                     downloadBuildManifest(
                                         url: BUILD_MANIFEST_URL,

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: '[email protected].1', retriever: modernSCM([
+lib = library(identifier: '[email protected].2', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -7,7 +7,7 @@
  * compatible open source license.
  */
 
-lib = library(identifier: '[email protected].1', retriever: modernSCM([
+lib = library(identifier: '[email protected].2', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))
@@ -296,13 +296,12 @@ pipeline {
                         node(AGENT_LABEL) {
                             docker.withRegistry('https://public.ecr.aws/') {
                                 docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) {
+                                    sh 'sleep 20'
                                     checkout scm
-
                                     downloadBuildManifest(
                                         url: BUILD_MANIFEST_URL,
                                         path: BUILD_MANIFEST
                                     )
-
                                     createUploadTestReportManifest(
                                         testManifest: "manifests/${TEST_MANIFEST}",
                                         buildManifest: BUILD_MANIFEST,
@@ -311,14 +310,14 @@ pipeline {
                                         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")
-                                    stash includes: 'test-report.yml', name: "test-report-$BUILD_NUMBER"
                                     archiveArtifacts artifacts: 'test-report.yml'
                                 }
                             }
                         }
                         node(agent_nodes['linux_x64']) {
-                            unstash "test-report-$BUILD_NUMBER"
                             def rc = (params.RC_NUMBER.toInteger() > 0)
+                            sh "mkdir -p test-results-os-${env.BUILD_NUMBER}"
+                            sh "curl -sSL 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 --output test-results-os-${env.BUILD_NUMBER}/test-report.yml"
                             publishIntegTestResults(
                                 version: env.version,
                                 distributionBuildNumber: env.buildId,

diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy
@@ -26,7 +26,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('6.7.1')
+                .defaultVersion('6.7.2')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')

diff --git a/tests/jenkins/TestOpenSearchIntegTest.groovy b/tests/jenkins/TestOpenSearchIntegTest.groovy
@@ -25,7 +25,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('6.7.1')
+                .defaultVersion('6.7.2')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')