diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index 9dd9a5c6b3..447a06a00d 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@7.3.0', 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 = [ @@ -27,7 +27,7 @@ def docker_args = [ ] def agent_nodes = [ - 'linux_x64': 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host', + 'linux_x64': 'Jenkins-Agent-Ubuntu2004-X64-M58xlarge-Single-Host', 'linux_arm64': 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host', 'windows_x64': 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host', ] @@ -146,6 +146,9 @@ pipeline { agent { label AGENT_LABEL } steps { script { + sh "test" + } + /*script { downloadBuildManifest( url: BUILD_MANIFEST_URL, path: BUILD_MANIFEST @@ -267,12 +270,12 @@ 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,13 +298,13 @@ 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" + sh "curl -sSL https://build.ci.opensearch.org/job/integ-test/8898/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, @@ -317,7 +320,7 @@ pipeline { } } } - post { + /*post { always { node(AGENT_LABEL) { script { @@ -333,5 +336,5 @@ pipeline { } } } - } + }*/ }