diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index 86ba8422ed..652fce743b 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -1,8 +1,23 @@ -lib = library(identifier: 'jenkins@1.0.4', retriever: modernSCM([ +lib = library(identifier: 'jenkins@2.1.0', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ])) +def docker_images = [ + "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2", + "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v1", +] + +def docker_args = [ + "tar": "-u 1000", + "rpm": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro" +] + +def agent_nodes = [ + "x64": "Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host", + "arm64": "Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host", +] + pipeline { options { timeout(time: 4, unit: 'HOURS') @@ -10,7 +25,10 @@ pipeline { agent none environment { BUILD_MANIFEST = "build-manifest.yml" - DEFAULT_BUILD_JOB_NAME = "distribution-build-opensearch-dashboards" + BUILD_MANIFEST_OPENSEARCH = "build-manifest-opensearch.yml" + BUILD_JOB_NAME = "distribution-build-opensearch-dashboards" + BUILD_JOB_NAME_OPENSEARCH = "distribution-build-opensearch" + ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name') } parameters { string( @@ -20,50 +38,65 @@ pipeline { ) string( name: 'BUILD_MANIFEST_URL', - description: 'The build manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.0.0/98/linux/x64/tar/builds/opensearch-dashboards/manifest.yml', + description: 'The build manifest URL, e.g. https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/2.5.0/5367/linux/x64/tar/builds/opensearch-dashboards/manifest.yml', trim: true ) string( - name: 'AGENT_LABEL', - description: 'The agent label where the tests should be executed. For x64 use Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host,for arm64 use Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host', + name: 'BUILD_MANIFEST_URL_OPENSEARCH', + description: 'The build manifest URL OpenSearch, e.g. "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.5.0/6976/linux/x64/tar/builds/opensearch/manifest.yml".', trim: true ) } stages { stage('verify-parameters') { - agent { label AGENT_LABEL } + agent { label agent_nodes["x64"] } steps { script { - currentBuild.description = BUILD_MANIFEST_URL - if (AGENT_LABEL == '') { - currentBuild.result = 'ABORTED' - error("Integration Tests failed to start. Missing parameter: AGENT_LABEL.") - } if (TEST_MANIFEST == '' || !fileExists("manifests/${TEST_MANIFEST}")) { currentBuild.result = 'ABORTED' error("Integration Tests failed to start. Test manifest was not provided or not found in manifests/${TEST_MANIFEST}.") } - /* - Rebuilding of this job will result in considering upstream build as self($JOB_NAME) See https://issues.jenkins.io/browse/JENKINS-61590 for bug - Either trigger from expected upstream job or run a new build - */ - env.BUILD_JOB_NAME = currentBuild.upstreamBuilds ? - currentBuild.upstreamBuilds[0].fullProjectName : - env.DEFAULT_BUILD_JOB_NAME - } - } - } - stage('detect docker image + args') { - agent { - docker { - label AGENT_LABEL - image 'alpine:3' - alwaysPull true - } - } - steps { - script { - DOCKER_AGENT = detectTestDockerAgent() + + if (BUILD_MANIFEST_URL == '') { + currentBuild.result = 'ABORTED' + error("Integration Tests failed to start. Build manifest url was not provided.") + } + + if (BUILD_MANIFEST_URL_OPENSEARCH == '') { + currentBuild.result = 'ABORTED' + error("Integration Tests failed to start. Build manifest url OpenSearch was not provided.") + } + + downloadBuildManifest( + url: BUILD_MANIFEST_URL, + path: BUILD_MANIFEST + ) + + downloadBuildManifest( + url: BUILD_MANIFEST_URL_OPENSEARCH, + path: BUILD_MANIFEST_OPENSEARCH + ) + + def buildManifestObj = lib.jenkins.BuildManifest.new(readYaml(file: BUILD_MANIFEST)) + def buildManifestObjOpenSearch = lib.jenkins.BuildManifest.new(readYaml(file: BUILD_MANIFEST_OPENSEARCH)) + env.architecture = buildManifestObj.getArtifactArchitecture() + env.buildId = buildManifestObj.getArtifactBuildId() + env.buildIdOpenSearch = buildManifestObjOpenSearch.getArtifactBuildId() + env.distribution = buildManifestObj.getDistribution() + env.version = buildManifestObj.build.version + env.versionOpenSearch = buildManifestObjOpenSearch.build.version + env.artifactPath = buildManifestObj.getArtifactRoot(BUILD_JOB_NAME, buildId) + env.artifactPathOpenSearch = buildManifestObjOpenSearch.getArtifactRoot(BUILD_JOB_NAME_OPENSEARCH, buildIdOpenSearch) + env.AGENT_LABEL = agent_nodes["$architecture"] + + echo "Version: ${version}, VersionOpenSearch: ${env.versionOpenSearch}, Agent: ${AGENT_LABEL}, OSD_BuildId: ${buildId}, OS_BuildId: ${buildIdOpenSearch}, Distribution: ${distribution}" + currentBuild.description = "$architecture, osd-$version-$buildId, os-$versionOpenSearch-$buildIdOpenSearch, $distribution" + + if (! env.version.equals(env.versionOpenSearch)) { + currentBuild.result = 'ABORTED' + error("OSD Version $version does not match OS Version $versionOpenSearch") + } + } } } @@ -71,8 +104,8 @@ pipeline { agent { docker { label AGENT_LABEL - image DOCKER_AGENT.image - args DOCKER_AGENT.args + image docker_images["$distribution"] + args docker_args["$distribution"] alwaysPull true } } @@ -82,16 +115,39 @@ pipeline { url: BUILD_MANIFEST_URL, path: BUILD_MANIFEST ) - String buildId = buildManifestObj.getArtifactBuildId() - env.BUILD_ID = buildId - echo "BUILD_MANIFEST: ${BUILD_MANIFEST}" - echo "BUILD_ID: ${BUILD_ID}" + + String switch_user_non_root = (distribution.equals('rpm') || distribution.equals('deb')) ? 'true' : 'false' + echo "switch_user_non_root: ${switch_user_non_root}" + + echo "Downloading from S3: ${artifactPathOpenSearch}" + downloadFromS3( + assumedRoleName: 'opensearch-bundle', + roleAccountNumberCred: 'jenkins-aws-account-public', + downloadPath: "${artifactPathOpenSearch}/", + bucketName: "${ARTIFACT_BUCKET_NAME}", + localPath: "${WORKSPACE}/artifacts", + force: true + ) + sh("cp -a $WORKSPACE/artifacts/${artifactPathOpenSearch} $WORKSPACE") + + echo "Downloading from S3: ${artifactPath}" + downloadFromS3( + assumedRoleName: 'opensearch-bundle', + roleAccountNumberCred: 'jenkins-aws-account-public', + downloadPath: "${artifactPath}/", + bucketName: "${ARTIFACT_BUCKET_NAME}", + localPath: "${WORKSPACE}/artifacts", + force: true + ) + sh("cp -a $WORKSPACE/artifacts/${artifactPath} $WORKSPACE") runIntegTestScript( - jobName: BUILD_JOB_NAME, + jobName: "$BUILD_JOB_NAME", componentName: 'functionalTestDashboards', - buildManifest: BUILD_MANIFEST, + buildManifest: "$BUILD_MANIFEST", testManifest: "manifests/${TEST_MANIFEST}", + localPath: "${WORKSPACE}/${distribution}", + switchUserNonRoot: "${switch_user_non_root}" ) } } diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index d82cb9c9d1..cfb0dea94f 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -128,7 +128,7 @@ pipeline { // Stash the current working directory files, aka opensearch-build repo // Unstash later in each triggered stage to run integTest - stash includes: "**", name: "opensearch-build-repo-$BUILD_NUMBER" + stash includes: "**", name: "integtest-opensearch-$BUILD_NUMBER" componentTests = [:] @@ -154,7 +154,7 @@ pipeline { // This sometimes causes the workspace to retain last run test-results and ends with build failures // https://github.com/opensearch-project/opensearch-build/blob/6ed1ce3c583233eae4fe1027969d778cfc7660f7/src/test_workflow/test_recorder/test_recorder.py#L99 sh("echo ${local_component} with index ${local_component_index} will sleep ${wait_seconds} seconds to reduce load && sleep ${wait_seconds}") - unstash "opensearch-build-repo-$BUILD_NUMBER" + unstash "integtest-opensearch-$BUILD_NUMBER" sh("rm -rf test-results") runIntegTestScript( jobName: "$BUILD_JOB_NAME", diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy index 25bc97a3dd..e76dfe102f 100644 --- a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy +++ b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy @@ -19,7 +19,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest { helper.registerSharedLibrary( library().name('jenkins') - .defaultVersion('1.0.4') + .defaultVersion('2.1.0') .allowOverride(true) .implicit(true) .targetPath('vars') @@ -43,6 +43,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest { binding.setVariable('env', ['BUILD_NUMBER': '215']) binding.setVariable('STAGE_NAME', 'DUMMY_STAGE_NAME') binding.setVariable('JOB_NAME', 'dummy_job') + binding.setVariable('distribution', 'tar') binding.setVariable('BUILD_NUMBER', '215') binding.setVariable('BUILD_URL', 'htth://BUILD_URL_dummy.com') binding.setVariable('WEBHOOK_URL', 'htth://WEBHOOK_URL_dummy.com') @@ -55,6 +56,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest { env['DOCKER_AGENT'] = [image:'opensearchstaging/ci-runner:ci-runner-centos7-v1', args:'-e JAVA_HOME=/opt/java/openjdk-11'] binding.getVariable('currentBuild').upstreamBuilds = [[fullProjectName: jobName]] + helper.registerAllowedMethod("s3Download", [Map]) helper.registerAllowedMethod("withCredentials", [Map]) helper.registerAllowedMethod('readYaml', [Map.class], { args -> diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt index 990dc6bfb9..e4e44e9f32 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt @@ -1,50 +1,82 @@ integ-test.run() integ-test.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git}) - integ-test.library({identifier=jenkins@1.0.4, retriever=null}) + integ-test.library({identifier=jenkins@2.1.0, retriever=null}) integ-test.pipeline(groovy.lang.Closure) + integ-test.credentials(jenkins-artifact-bucket-name) integ-test.timeout({time=4, unit=HOURS}) integ-test.echo(Executing on agent [label:none]) integ-test.stage(verify-parameters, groovy.lang.Closure) integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]) integ-test.script(groovy.lang.Closure) integ-test.fileExists(manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml) - integ-test.stage(detect docker image + args, groovy.lang.Closure) - integ-test.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, image:alpine:3, reuseNode:false, stages:[:]]]) - integ-test.script(groovy.lang.Closure) - integ-test.detectTestDockerAgent() - detectTestDockerAgent.legacySCM(groovy.lang.Closure) - detectTestDockerAgent.library({identifier=jenkins@1.0.4, retriever=null}) - detectTestDockerAgent.readYaml({file=manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml}) - TestManifest.asBoolean() - detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) + integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar/dist/opensearch-dashboards/opensearch-dashboards-1.2.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) + downloadBuildManifest.legacySCM(groovy.lang.Closure) + downloadBuildManifest.library({identifier=jenkins@2.1.0, retriever=null}) + downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar/dist/opensearch-dashboards/opensearch-dashboards-1.2.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml) + downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) + BuildManifest.asBoolean() + integ-test.downloadBuildManifest({url=null, path=build-manifest-opensearch.yml}) + downloadBuildManifest.legacySCM(groovy.lang.Closure) + downloadBuildManifest.library({identifier=jenkins@2.1.0, retriever=null}) + downloadBuildManifest.sh(curl -sSL null --output build-manifest-opensearch.yml) + downloadBuildManifest.readYaml({file=build-manifest-opensearch.yml}) + BuildManifest.asBoolean() + integ-test.readYaml({file=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) + BuildManifest.asBoolean() + integ-test.readYaml({file=build-manifest-opensearch.yml}) + BuildManifest.asBoolean() + BuildManifest.getArtifactArchitecture() + BuildManifest.getArtifactBuildId() + BuildManifest.getArtifactBuildId() + BuildManifest.getDistribution() + BuildManifest.getArtifactRoot(distribution-build-opensearch-dashboards, 215) + BuildManifest.getArtifactRoot(distribution-build-opensearch, 215) + integ-test.echo(Version: 1.2.0, VersionOpenSearch: 1.2.0, Agent: Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, OSD_BuildId: 215, OS_BuildId: 215, Distribution: tar) integ-test.stage(integ-test, groovy.lang.Closure) - integ-test.echo(Executing on agent [docker:[alwaysPull:true, args:-e JAVA_HOME=/opt/java/openjdk-11, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:]]]) + integ-test.echo(Executing on agent [docker:[alwaysPull:true, args:-u 1000, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2, reuseNode:false, stages:[:]]]) integ-test.script(groovy.lang.Closure) integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar/dist/opensearch-dashboards/opensearch-dashboards-1.2.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) - downloadBuildManifest.library({identifier=jenkins@1.0.4, retriever=null}) + downloadBuildManifest.library({identifier=jenkins@2.1.0, retriever=null}) downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar/dist/opensearch-dashboards/opensearch-dashboards-1.2.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml) downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) BuildManifest.asBoolean() - BuildManifest.getArtifactBuildId() - integ-test.echo(BUILD_MANIFEST: tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml) - integ-test.echo(BUILD_ID: 215) - integ-test.runIntegTestScript({jobName=dummy_job, componentName=functionalTestDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml}) + integ-test.echo(switch_user_non_root: false) + integ-test.echo(Downloading from S3: distribution-build-opensearch/1.2.0/215/linux/x64/tar) + integ-test.downloadFromS3({assumedRoleName=opensearch-bundle, roleAccountNumberCred=jenkins-aws-account-public, downloadPath=distribution-build-opensearch/1.2.0/215/linux/x64/tar/, bucketName=DUMMY_ARTIFACT_BUCKET_NAME, localPath=/tmp/workspace/artifacts, force=true}) + downloadFromS3.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_NUMBER}) + downloadFromS3.withCredentials([AWS_ACCOUNT_NUMBER], groovy.lang.Closure) + downloadFromS3.withAWS({role=opensearch-bundle, roleAccount=AWS_ACCOUNT_NUMBER, duration=900, roleSessionName=jenkins-session, region=us-east-1}, groovy.lang.Closure) + downloadFromS3.s3Download({file=/tmp/workspace/artifacts, bucket=DUMMY_ARTIFACT_BUCKET_NAME, path=distribution-build-opensearch/1.2.0/215/linux/x64/tar/, force=true}) + integ-test.sh(cp -a /tmp/workspace/artifacts/distribution-build-opensearch/1.2.0/215/linux/x64/tar /tmp/workspace) + integ-test.echo(Downloading from S3: distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar) + integ-test.downloadFromS3({assumedRoleName=opensearch-bundle, roleAccountNumberCred=jenkins-aws-account-public, downloadPath=distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar/, bucketName=DUMMY_ARTIFACT_BUCKET_NAME, localPath=/tmp/workspace/artifacts, force=true}) + downloadFromS3.string({credentialsId=jenkins-aws-account-public, variable=AWS_ACCOUNT_NUMBER}) + downloadFromS3.withCredentials([AWS_ACCOUNT_NUMBER], groovy.lang.Closure) + downloadFromS3.withAWS({role=opensearch-bundle, roleAccount=AWS_ACCOUNT_NUMBER, duration=900, roleSessionName=jenkins-session, region=us-east-1}, groovy.lang.Closure) + downloadFromS3.s3Download({file=/tmp/workspace/artifacts, bucket=DUMMY_ARTIFACT_BUCKET_NAME, path=distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar/, force=true}) + integ-test.sh(cp -a /tmp/workspace/artifacts/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar /tmp/workspace) + integ-test.runIntegTestScript({jobName=distribution-build-opensearch-dashboards, componentName=functionalTestDashboards, buildManifest=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false}) runIntegTestScript.legacySCM(groovy.lang.Closure) - runIntegTestScript.library({identifier=jenkins@1.0.4, retriever=null}) + runIntegTestScript.library({identifier=jenkins@2.1.0, retriever=null}) runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) BuildManifest.asBoolean() + BuildManifest.getDistribution() + runIntegTestScript.echo(Start integTest for distribution type: tar) + runIntegTestScript.echo(Possible Java Home: ) runIntegTestScript.echo(Build Id: 215) - BuildManifest.getArtifactRootUrl(dummy_job, 215) - runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) - runIntegTestScript.echo(No localPath found, download from url) - runIntegTestScript.echo(Paths: opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) + BuildManifest.getArtifactRootUrl(distribution-build-opensearch-dashboards, 215) + runIntegTestScript.echo(Artifact root URL: https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/tar) + runIntegTestScript.echo(User provides localPath, use local artifacts: /tmp/workspace/tar) + runIntegTestScript.echo(Paths: opensearch=/tmp/workspace/tar opensearch-dashboards=/tmp/workspace/tar) runIntegTestScript.echo(Component: functionalTestDashboards) - runIntegTestScript.sh(./test.sh integ-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --component functionalTestDashboards --test-run-id 215 --paths opensearch=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.2.0/latest/linux/x64/tar opensearch-dashboards=https://ci.opensearch.org/ci/dbc/dummy_job/1.2.0/215/linux/x64/tar) + runIntegTestScript.echo(Switch User to Non-Root (uid=1000): false) + runIntegTestScript.echo(Run command: ./test.sh integ-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --component functionalTestDashboards --test-run-id 215 --paths opensearch=/tmp/workspace/tar opensearch-dashboards=/tmp/workspace/tar ) + runIntegTestScript.sh( ./test.sh integ-test manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml --component functionalTestDashboards --test-run-id 215 --paths opensearch=/tmp/workspace/tar opensearch-dashboards=/tmp/workspace/tar ) integ-test.script(groovy.lang.Closure) integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml, jobName=dummy_job}) uploadTestResults.legacySCM(groovy.lang.Closure) - uploadTestResults.library({identifier=jenkins@1.0.4, retriever=null}) + uploadTestResults.library({identifier=jenkins@2.1.0, retriever=null}) uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml}) BuildManifest.asBoolean() uploadTestResults.echo(Build Id: 215) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt index c475ab1812..615dc70364 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt @@ -50,14 +50,14 @@ downloadFromS3.withAWS({role=opensearch-bundle, roleAccount=AWS_ACCOUNT_NUMBER, duration=900, roleSessionName=jenkins-session, region=us-east-1}, groovy.lang.Closure) downloadFromS3.s3Download({file=/tmp/workspace/artifacts, bucket=job-s3-bucket-name, path=distribution-build-opensearch/1.3.0/717/linux/x64/tar/, force=true}) integ-test.sh(mv -v /tmp/workspace/artifacts/distribution-build-opensearch/1.3.0/717/linux/x64/tar /tmp/workspace) - integ-test.stash({includes=**, name=opensearch-build-repo-717}) + integ-test.stash({includes=**, name=integtest-opensearch-717}) integ-test.echo(Add Component: OpenSearch) integ-test.parallel({Run Integtest OpenSearch=groovy.lang.Closure}) integ-test.timeout({time=2, unit=HOURS}, groovy.lang.Closure) integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.echo(Component Name: OpenSearch) integ-test.sh(echo OpenSearch with index 0 will sleep 0 seconds to reduce load && sleep 0) - integ-test.unstash(opensearch-build-repo-717) + integ-test.unstash(integtest-opensearch-717) integ-test.sh(rm -rf test-results) integ-test.runIntegTestScript({jobName=distribution-build-opensearch, componentName=OpenSearch, buildManifest=tests/jenkins/data/opensearch-1.3.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-1.3.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false}) runIntegTestScript.legacySCM(groovy.lang.Closure)