From dcec4cff66ef7aa076948f72ababb814658879c8 Mon Sep 17 00:00:00 2001
From: Prudhvi Godithi <pgodithi@amazon.com>
Date: Wed, 16 Oct 2024 15:56:44 -0700
Subject: [PATCH] Integration test results

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
---
 jenkins/opensearch/integ-test.jenkinsfile | 43 ++++++++++++-----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
index 7183a9677a..9f2dc610d9 100644
--- a/jenkins/opensearch/integ-test.jenkinsfile
+++ b/jenkins/opensearch/integ-test.jenkinsfile
@@ -7,9 +7,9 @@
  * compatible open source license.
  */
 
-lib = library(identifier: 'jenkins@6.9.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 = [
@@ -112,7 +112,7 @@ pipeline {
                 }
             }
         }
-        stage('validate-artifacts') {
+       /* stage('validate-artifacts') {
             when {
                 expression {
                     params.VALIDATE_ARTIFACTS == true
@@ -139,12 +139,15 @@ pipeline {
                     postCleanup()
                 }
             }
-        }
+        }*/
         stage('integ-test') {
             // Need to run this directly on agent node here in order to trigger stages with docker container and avoid docker within docker situation
             // Can only be run in runner that is at least 50GB per container
             agent { label AGENT_LABEL }
             steps {
+                sh "Sample stage"
+            }
+            /*steps {
                 script {
                     downloadBuildManifest(
                         url: BUILD_MANIFEST_URL,
@@ -268,11 +271,11 @@ pipeline {
                     }
                     parallel componentTests
                 }
-            }
+            }*/
             post {
                 always {
                     script {
-                        retry(5) {
+                        /*retry(5) {
                             node(AGENT_LABEL) {
                                 docker.withRegistry('https://public.ecr.aws/') {
                                     docker.image(docker_images["$distribution"]).inside(docker_args["$distribution"]) {
@@ -295,20 +298,20 @@ pipeline {
                                     }
                                 }
                             }
-                        }
-                        retry(5) { 
-                            node(agent_nodes['linux_x64']) {
-                                sleep 10
-                                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(
-                                    distributionBuildUrl: "https://build.ci.opensearch.org/blue/organizations/jenkins/${env.BUILD_JOB_NAME}/detail/${env.BUILD_JOB_NAME}/${env.buildId}/pipeline",
-                                    jobName: env.JOB_NAME,
-                                    testReportManifestYml: "test-results-os-${env.BUILD_NUMBER}/test-report.yml"
-                                )
-                                postCleanup()
-                            }
+                        }*/
+                        node(agent_nodes['linux_x64']) {
+                            sleep 10
+                            def rc = (params.RC_NUMBER.toInteger() > 0)
+                            sh "mkdir -p test-results-os-${env.BUILD_NUMBER}"
+                            //  https://build.ci.opensearch.org/job/integ-test-opensearch-dashboards/6589/artifact/test-report.yml
+                            //  https://build.ci.opensearch.org/job/integ-test/8808/artifact/test-report.yml 
+                            sh "curl -sSL https://build.ci.opensearch.org/job/integ-test-opensearch-dashboards/6589/artifact/test-report.yml --output test-results-os-${env.BUILD_NUMBER}/test-report.yml"
+                            publishIntegTestResults(
+                                distributionBuildUrl: "https://build.ci.opensearch.org/blue/organizations/jenkins/${env.BUILD_JOB_NAME}/detail/${env.BUILD_JOB_NAME}/${env.buildId}/pipeline",
+                                jobName: env.JOB_NAME,
+                                testReportManifestYml: "test-results-os-${env.BUILD_NUMBER}/test-report.yml"
+                            )
+                            postCleanup()
                         }
 
                     }