From 43dd6ab60e69adf49e3a0231a520527c3e284c8f Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 20 Jul 2022 18:24:18 +0000 Subject: [PATCH] Make agent label have consistent capital naming Signed-off-by: Peter Zhu --- jenkins/check-for-build.jenkinsfile | 2 +- .../perf-test.jenkinsfile | 2 +- .../release-data-prepper-all-artifacts.jenkinsfile | 6 +++--- jenkins/docker/docker-build.jenkinsfile | 2 +- jenkins/docker/docker-copy.jenkinsfile | 2 +- jenkins/gradle/gradle-check.jenkinsfile | 2 +- jenkins/opensearch-dashboards/bwc-test.jenkinsfile | 4 ++-- .../distribution-build.jenkinsfile | 4 ++-- .../opensearch-dashboards/integ-test.jenkinsfile | 2 +- .../maven-sign-release.jenkinsfile | 2 +- jenkins/opensearch-ruby/Jenkinsfile | 4 ++-- jenkins/opensearch/bwc-test.jenkinsfile | 4 ++-- jenkins/opensearch/distribution-build.jenkinsfile | 4 ++-- jenkins/opensearch/integ-test.jenkinsfile | 2 +- jenkins/opensearch/perf-test.jenkinsfile | 2 +- jenkins/promotion/promote-artifacts.jenkinsfile | 2 +- jenkins/promotion/promote-docker-ecr.jenkinsfile | 2 +- jenkins/promotion/promote-yum-repos.jenkinsfile | 2 +- jenkins/release-tag/release-tag.jenkinsfile | 2 +- jenkins/rpm-validation/rpm-validation.jenkinsfile | 2 +- .../sign-standalone-artifacts.jenkinsfile | 2 +- .../whitesource-scan.jenkinsfile | 2 +- tests/jenkins/TestOpenSearchBwcTest.groovy | 2 +- .../jenkins/TestOpenSearchDashboardsBwcTest.groovy | 2 +- .../TestOpenSearchDashboardsIntegTest.groovy | 2 +- tests/jenkins/TestOpenSearchIntegTest.groovy | 2 +- .../perf-test.jenkinsfile.txt | 6 +++--- .../maven-sign-release.jenkinsfile.txt | 2 +- .../opensearch-dashboards/bwc-test.jenkinsfile.txt | 8 ++++---- .../integ-test.jenkinsfile.txt | 8 ++++---- .../opensearch/bwc-test.jenkinsfile.txt | 8 ++++---- .../opensearch/integ-test.jenkinsfile.txt | 10 +++++----- .../perf-test-with-security.jenkinsfile.txt | 8 ++++---- .../opensearch/perf-test.jenkinsfile.txt | 6 +++--- ...er-testPromoteContainerToDocker.jenkinsfile.txt | 2 +- ...ContainerToDockerECRLatestMajor.jenkinsfile.txt | 2 +- ...tPromoteContainerToDockerLatest.jenkinsfile.txt | 2 +- ...oteContainerToDockerLatestMajor.jenkinsfile.txt | 2 +- ...stPromoteContainerToDockerMajor.jenkinsfile.txt | 2 +- ...romoteContainerToECRLatestMajor.jenkinsfile.txt | 2 +- .../release-tag-dashboards.jenkinsfile.txt | 2 +- .../release-tag/release-tag.jenkinsfile.txt | 2 +- .../sign-standalone-artifacts.jenkinsfile.txt | 2 +- .../jobs/Build_OpenSearch_Dashboards_Jenkinsfile | 14 +++++++------- tests/jenkins/jobs/ParallelMessages_Jenkinsfile | 10 +++++----- .../promote-distribution-artifacts.jenkinsfile.txt | 2 +- .../lib-testers/RunPerfTestScriptLibTest.groovy | 2 +- 47 files changed, 84 insertions(+), 84 deletions(-) diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile index 6cfb0fa3a7..ec534c4a3c 100644 --- a/jenkins/check-for-build.jenkinsfile +++ b/jenkins/check-for-build.jenkinsfile @@ -7,7 +7,7 @@ pipeline { } agent none environment { - AGENT_X64 = 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + AGENT_X64 = 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' } triggers { parameterizedCron ''' diff --git a/jenkins/cross-cluster-replication/perf-test.jenkinsfile b/jenkins/cross-cluster-replication/perf-test.jenkinsfile index 752500444d..7821d9580a 100644 --- a/jenkins/cross-cluster-replication/perf-test.jenkinsfile +++ b/jenkins/cross-cluster-replication/perf-test.jenkinsfile @@ -6,7 +6,7 @@ pipeline { timeout(time: 10, unit: 'HOURS') } environment { - AGENT_LABEL = 'Jenkins-Agent-al2-x64-m52xlarge-Docker-Host-Perf-Test' + AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test' AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v1' BUNDLE_MANIFEST = 'bundle-manifest.yml' JOB_NAME = 'ccr-perf-test' diff --git a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile index 4e4b599eb5..a133824c10 100644 --- a/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile +++ b/jenkins/data-prepper/release-data-prepper-all-artifacts.jenkinsfile @@ -20,7 +20,7 @@ pipeline { stage('Promote Archives') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2' args '-e JAVA_HOME=/opt/java/openjdk-11' alwaysPull true @@ -72,7 +72,7 @@ pipeline { stage('Promote Docker') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'alpine:3' alwaysPull true } @@ -118,7 +118,7 @@ pipeline { stage('Promote Maven') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2' args '-e JAVA_HOME=/opt/java/openjdk-11' alwaysPull true diff --git a/jenkins/docker/docker-build.jenkinsfile b/jenkins/docker/docker-build.jenkinsfile index 37f288025b..6f3b1b5fe7 100644 --- a/jenkins/docker/docker-build.jenkinsfile +++ b/jenkins/docker/docker-build.jenkinsfile @@ -27,7 +27,7 @@ pipeline { stage('docker-build') { agent { docker { - label 'Jenkins-Agent-Ubuntu2004-X64-m52xlarge-Docker-Builder' + label 'Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder' image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk14' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' alwaysPull true diff --git a/jenkins/docker/docker-copy.jenkinsfile b/jenkins/docker/docker-copy.jenkinsfile index 5df1b64059..5b62d2def1 100644 --- a/jenkins/docker/docker-copy.jenkinsfile +++ b/jenkins/docker/docker-copy.jenkinsfile @@ -31,7 +31,7 @@ pipeline { stage("Image Copy") { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' } diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile index 2b779510f8..836e50408e 100644 --- a/jenkins/gradle/gradle-check.jenkinsfile +++ b/jenkins/gradle/gradle-check.jenkinsfile @@ -20,7 +20,7 @@ pipeline { // Must use Ubuntu agent with 1 executor or gradle check will show a lot of java-related errors // The c524xlarge is the instance type that has the least amount of errors during gradle check // https://github.com/opensearch-project/OpenSearch/issues/1975 - label 'Jenkins-Agent-Ubuntu2004-X64-c524xlarge-Single-Host' + label 'Jenkins-Agent-Ubuntu2004-X64-C524xlarge-Single-Host' } } parameters { diff --git a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile index bfd1815f3e..66583bf30c 100644 --- a/jenkins/opensearch-dashboards/bwc-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/bwc-test.jenkinsfile @@ -22,7 +22,7 @@ pipeline { ) string( name: 'AGENT_LABEL', - description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-al2-x64-c54xlarge-Docker-Host.', + description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host.', trim: true ) } @@ -57,7 +57,7 @@ pipeline { stage('detect docker image + args') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028' alwaysPull true } diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile index 3529b16dba..0b339b0616 100644 --- a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile +++ b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile @@ -6,8 +6,8 @@ pipeline { } agent none environment { - AGENT_X64 = 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' - AGENT_ARM64 = 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + AGENT_X64 = 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' + AGENT_ARM64 = 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host' IMAGE_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' // required for rpm to create digest sha256 correctly with rpm 4.12+ } parameters { diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index be59e11a32..d09c4461c0 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -22,7 +22,7 @@ pipeline { ) 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', + 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', trim: true ) } diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile index c592b3b9bc..49fe7e876d 100644 --- a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile +++ b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile @@ -3,7 +3,7 @@ lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm)) pipeline { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130' alwaysPull true } diff --git a/jenkins/opensearch-ruby/Jenkinsfile b/jenkins/opensearch-ruby/Jenkinsfile index b9cb5dc94a..1b583a38cb 100644 --- a/jenkins/opensearch-ruby/Jenkinsfile +++ b/jenkins/opensearch-ruby/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { stage('ruby-build-sign-upload') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130' alwaysPull true } @@ -53,7 +53,7 @@ pipeline { } post { always { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + node('Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') { script { postCleanup() } diff --git a/jenkins/opensearch/bwc-test.jenkinsfile b/jenkins/opensearch/bwc-test.jenkinsfile index b9a9db2c7f..0ecde74062 100644 --- a/jenkins/opensearch/bwc-test.jenkinsfile +++ b/jenkins/opensearch/bwc-test.jenkinsfile @@ -25,7 +25,7 @@ pipeline { ) string( name: 'AGENT_LABEL', - description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-al2-x64-c54xlarge-Docker-Host.', + description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host.', trim: true ) } @@ -60,7 +60,7 @@ pipeline { stage('detect docker image + args') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028' alwaysPull true } diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile index 97d80a31b1..b03f0a4fe4 100644 --- a/jenkins/opensearch/distribution-build.jenkinsfile +++ b/jenkins/opensearch/distribution-build.jenkinsfile @@ -6,8 +6,8 @@ pipeline { } agent none environment { - AGENT_X64 = 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' - AGENT_ARM64 = 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + AGENT_X64 = 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' + AGENT_ARM64 = 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host' IMAGE_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' // required for rpm to create digest sha256 correctly with rpm 4.12+ } parameters { diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index d5427f0bca..1acf5e2f8e 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -25,7 +25,7 @@ pipeline { ) 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', + 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', trim: true ) } diff --git a/jenkins/opensearch/perf-test.jenkinsfile b/jenkins/opensearch/perf-test.jenkinsfile index d381f1f0c1..4c8cf7a2bb 100644 --- a/jenkins/opensearch/perf-test.jenkinsfile +++ b/jenkins/opensearch/perf-test.jenkinsfile @@ -6,7 +6,7 @@ pipeline { timeout(time: 15, unit: 'HOURS') } environment { - AGENT_LABEL = 'Jenkins-Agent-al2-x64-m52xlarge-Docker-Host-Perf-Test' + AGENT_LABEL = 'Jenkins-Agent-AL2-X64-M52xlarge-Docker-Host-Perf-Test' AGENT_IMAGE = 'opensearchstaging/ci-runner:ci-runner-centos7-performance-test-v1' BUNDLE_MANIFEST = 'bundle-manifest.yml' JOB_NAME = 'perf-test' diff --git a/jenkins/promotion/promote-artifacts.jenkinsfile b/jenkins/promotion/promote-artifacts.jenkinsfile index 85626eed8c..e2bd3fd10b 100644 --- a/jenkins/promotion/promote-artifacts.jenkinsfile +++ b/jenkins/promotion/promote-artifacts.jenkinsfile @@ -38,7 +38,7 @@ pipeline { stage('promote artifacts') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ci-runner-centos7-v1' alwaysPull true } diff --git a/jenkins/promotion/promote-docker-ecr.jenkinsfile b/jenkins/promotion/promote-docker-ecr.jenkinsfile index 4e02f4cda1..e3463f0711 100644 --- a/jenkins/promotion/promote-docker-ecr.jenkinsfile +++ b/jenkins/promotion/promote-docker-ecr.jenkinsfile @@ -6,7 +6,7 @@ pipeline { } agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' } diff --git a/jenkins/promotion/promote-yum-repos.jenkinsfile b/jenkins/promotion/promote-yum-repos.jenkinsfile index b2de0c7b04..fbe39be251 100644 --- a/jenkins/promotion/promote-yum-repos.jenkinsfile +++ b/jenkins/promotion/promote-yum-repos.jenkinsfile @@ -28,7 +28,7 @@ pipeline { stage('promote yum repo') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' alwaysPull true } diff --git a/jenkins/release-tag/release-tag.jenkinsfile b/jenkins/release-tag/release-tag.jenkinsfile index 3742021fc7..a621543580 100644 --- a/jenkins/release-tag/release-tag.jenkinsfile +++ b/jenkins/release-tag/release-tag.jenkinsfile @@ -6,7 +6,7 @@ pipeline { } agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130' alwaysPull true } diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile index 8585023fcc..bd3755a427 100644 --- a/jenkins/rpm-validation/rpm-validation.jenkinsfile +++ b/jenkins/rpm-validation/rpm-validation.jenkinsfile @@ -13,7 +13,7 @@ pipeline { ) string( name: 'AGENT_LABEL', - description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-al2-x64-c54xlarge-Docker-Host or Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host', + description: 'The agent label where the tests should be executed, e.g. Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host or Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host', trim: true ) diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile index 684d944b40..80db04f055 100644 --- a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile +++ b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile @@ -3,7 +3,7 @@ lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm)) pipeline { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2' alwaysPull true } diff --git a/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile b/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile index 2d24c41dc5..25a34346f1 100644 --- a/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile +++ b/jenkins/vulnerability-scan/whitesource-scan.jenkinsfile @@ -11,7 +11,7 @@ pipeline { stage('Run the scan') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028' args '-e LANG=en_US.UTF-8' alwaysPull true diff --git a/tests/jenkins/TestOpenSearchBwcTest.groovy b/tests/jenkins/TestOpenSearchBwcTest.groovy index 8875885804..1df9ab2fb9 100644 --- a/tests/jenkins/TestOpenSearchBwcTest.groovy +++ b/tests/jenkins/TestOpenSearchBwcTest.groovy @@ -18,7 +18,7 @@ class TestOpenSearchBwcTest extends BuildPipelineTest { def buildId = 717 def buildManifest = "tests/jenkins/data/opensearch-1.3.0-build.yml" def buildManifestUrl = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/${buildId}/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz" - def agentLabel = "Jenkins-Agent-al2-x64-c54xlarge-Docker-Host" + def agentLabel = "Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host" this.registerLibTester(new DetectTestDockerAgentLibTester()) this.registerLibTester(new DownloadBuildManifestLibTester(buildManifestUrl, buildManifest)) diff --git a/tests/jenkins/TestOpenSearchDashboardsBwcTest.groovy b/tests/jenkins/TestOpenSearchDashboardsBwcTest.groovy index 2a34130eb2..db1ca6b5be 100644 --- a/tests/jenkins/TestOpenSearchDashboardsBwcTest.groovy +++ b/tests/jenkins/TestOpenSearchDashboardsBwcTest.groovy @@ -18,7 +18,7 @@ class TestOpenSearchDashboardsBwcTest extends BuildPipelineTest { def buildId = 215 def buildManifest = "tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml" def buildManifestUrl = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/${buildId}/linux/x64/dist/opensearch-dashboards/opensearch-dashboards-1.2.0-linux-x64.tar.gz" - def agentLabel = "Jenkins-Agent-al2-x64-c54xlarge-Docker-Host" + def agentLabel = "Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host" this.registerLibTester(new DetectTestDockerAgentLibTester()) this.registerLibTester(new DownloadBuildManifestLibTester(buildManifestUrl, buildManifest)) diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy index cd8caa31e0..c54d929467 100644 --- a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy +++ b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy @@ -18,7 +18,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest { def buildId = 215 def buildManifest = "tests/jenkins/data/opensearch-dashboards-1.2.0-build.yml" def buildManifestUrl = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/${buildId}/linux/x64/tar/dist/opensearch-dashboards/opensearch-dashboards-1.2.0-linux-x64.tar.gz" - def agentLabel = "Jenkins-Agent-al2-x64-c54xlarge-Docker-Host" + def agentLabel = "Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host" this.registerLibTester(new DetectTestDockerAgentLibTester()) this.registerLibTester(new DownloadBuildManifestLibTester(buildManifestUrl, buildManifest)) diff --git a/tests/jenkins/TestOpenSearchIntegTest.groovy b/tests/jenkins/TestOpenSearchIntegTest.groovy index 6ba5fa5221..2a1f919fbf 100644 --- a/tests/jenkins/TestOpenSearchIntegTest.groovy +++ b/tests/jenkins/TestOpenSearchIntegTest.groovy @@ -18,7 +18,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest { def buildId = 717 def buildManifest = "tests/jenkins/data/opensearch-1.3.0-build.yml" def buildManifestUrl = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/${buildId}/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz" - def agentLabel = "Jenkins-Agent-al2-x64-c54xlarge-Docker-Host" + def agentLabel = "Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host" this.registerLibTester(new DetectTestDockerAgentLibTester()) this.registerLibTester(new DownloadBuildManifestLibTester(buildManifestUrl, buildManifest)) diff --git a/tests/jenkins/jenkinsjob-regression-files/cross-cluster-replication/perf-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/cross-cluster-replication/perf-test.jenkinsfile.txt index 6cb8863eb2..164e9f7d92 100644 --- a/tests/jenkins/jenkinsjob-regression-files/cross-cluster-replication/perf-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/cross-cluster-replication/perf-test.jenkinsfile.txt @@ -5,7 +5,7 @@ perf-test.timeout({time=10, unit=HOURS}) perf-test.echo(Executing on agent [label:none]) perf-test.stage(validate-and-set-parameters, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -21,7 +21,7 @@ perf-test.writeFile({file=messages/perf-test.msg, text=CCR Performance tests for #1236}) perf-test.stash({includes=messages/*, name=messages-perf-test}) perf-test.stage(perf-test, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -83,7 +83,7 @@ CCR Performance tests for 1236 completed}) uploadTestResults.stash({includes=messages/*, name=messages-test_stage}) perf-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - perf-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + perf-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) perf-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([perf-test]) diff --git a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt index 85c7fa91ee..2da3f0658d 100644 --- a/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/maven-sign-release/maven-sign-release.jenkinsfile.txt @@ -3,7 +3,7 @@ maven-sign-release.library({identifier=jenkins@20211123, retriever=null}) maven-sign-release.pipeline(groovy.lang.Closure) maven-sign-release.credentials(jenkins-artifact-bucket-name) - maven-sign-release.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + maven-sign-release.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) maven-sign-release.stage(sign, groovy.lang.Closure) maven-sign-release.script(groovy.lang.Closure) maven-sign-release.echo(Downloading from S3.) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt index 5fb15bcf82..76767aea5d 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/bwc-test.jenkinsfile.txt @@ -5,11 +5,11 @@ bwc-test.timeout({time=3, unit=HOURS}) bwc-test.echo(Executing on agent [label:none]) bwc-test.stage(verify-parameters, groovy.lang.Closure) - bwc-test.echo(Executing on agent [label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]) + bwc-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]) bwc-test.script(groovy.lang.Closure) bwc-test.fileExists(manifests/tests/jenkins/data/opensearch-dashboards-1.2.0-test.yml) bwc-test.stage(detect docker image + args, groovy.lang.Closure) - bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) bwc-test.script(groovy.lang.Closure) bwc-test.detectTestDockerAgent() detectTestDockerAgent.legacySCM(groovy.lang.Closure) @@ -18,7 +18,7 @@ TestManifest.asBoolean() detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) bwc-test.stage(bwc-test, groovy.lang.Closure) - bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) bwc-test.script(groovy.lang.Closure) bwc-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/1.2.0/215/linux/x64/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) @@ -59,7 +59,7 @@ uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME}) bwc-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - bwc-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + bwc-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) bwc-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([bwc-test]) 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 7d3a66ecf2..403028d319 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 @@ -5,11 +5,11 @@ integ-test.timeout({time=3, 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.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:[image:alpine:3, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + integ-test.echo(Executing on agent [docker:[image:alpine:3, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) integ-test.script(groovy.lang.Closure) integ-test.detectTestDockerAgent() detectTestDockerAgent.legacySCM(groovy.lang.Closure) @@ -18,7 +18,7 @@ TestManifest.asBoolean() detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) integ-test.stage(integ-test, groovy.lang.Closure) - integ-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + integ-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) 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) @@ -61,7 +61,7 @@ uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME}) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - integ-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([integ-test]) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt index 02ced5faaa..aec9576e71 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/bwc-test.jenkinsfile.txt @@ -5,11 +5,11 @@ bwc-test.timeout({time=3, unit=HOURS}) bwc-test.echo(Executing on agent [label:none]) bwc-test.stage(verify-parameters, groovy.lang.Closure) - bwc-test.echo(Executing on agent [label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]) + bwc-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]) bwc-test.script(groovy.lang.Closure) bwc-test.fileExists(manifests/tests/jenkins/data/opensearch-1.3.0-test.yml) bwc-test.stage(detect docker image + args, groovy.lang.Closure) - bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) bwc-test.script(groovy.lang.Closure) bwc-test.detectTestDockerAgent() detectTestDockerAgent.legacySCM(groovy.lang.Closure) @@ -18,7 +18,7 @@ TestManifest.asBoolean() detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) bwc-test.stage(bwc-test, groovy.lang.Closure) - bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + bwc-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) bwc-test.script(groovy.lang.Closure) bwc-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/717/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-1.3.0-build.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -59,7 +59,7 @@ uploadTestResults.stash({includes=messages/*, name=messages-DUMMY_STAGE_NAME}) bwc-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - bwc-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + bwc-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) bwc-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([bwc-test]) 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 9256a2f753..7e45ef1ccd 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt @@ -5,11 +5,11 @@ integ-test.timeout({time=3, 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.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-1.3.0-test.yml) integ-test.stage(detect docker image + args, groovy.lang.Closure) - integ-test.echo(Executing on agent [docker:[image:alpine:3, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + integ-test.echo(Executing on agent [docker:[image:alpine:3, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) integ-test.script(groovy.lang.Closure) integ-test.detectTestDockerAgent() detectTestDockerAgent.legacySCM(groovy.lang.Closure) @@ -18,7 +18,7 @@ TestManifest.asBoolean() detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null)) integ-test.stage(integ-test, groovy.lang.Closure) - integ-test.echo(Executing on agent [label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]) + integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]) integ-test.script(groovy.lang.Closure) integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/717/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-1.3.0-build.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -34,7 +34,7 @@ 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.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.echo(Component Name: OpenSearch) integ-test.unstash(opensearch-build-repo) integ-test.sh(rm -rf test-results) @@ -71,7 +71,7 @@ postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) integ-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - integ-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + integ-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) integ-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([integ-test]) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test-with-security.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test-with-security.jenkinsfile.txt index 45cc7a3b11..35f313c775 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test-with-security.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test-with-security.jenkinsfile.txt @@ -5,7 +5,7 @@ perf-test.timeout({time=15, unit=HOURS}) perf-test.echo(Executing on agent [label:none]) perf-test.stage(validate-and-set-parameters, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -21,7 +21,7 @@ perf-test.writeFile({file=messages/perf-test.msg, text=Performance tests for #1236}) perf-test.stash({includes=messages/*, name=messages-perf-test}) perf-test.stage(test-with-security, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -84,7 +84,7 @@ Performance tests with security for 1236 completed}) perf-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) perf-test.stage(test-without-security, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -146,7 +146,7 @@ Performance tests without security for 1236 completed}) uploadTestResults.stash({includes=messages/*, name=messages-test_stage}) perf-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - perf-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + perf-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) perf-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([perf-test]) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test.jenkinsfile.txt index 9700aeaaa8..2dc5a686ea 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/perf-test.jenkinsfile.txt @@ -5,7 +5,7 @@ perf-test.timeout({time=15, unit=HOURS}) perf-test.echo(Executing on agent [label:none]) perf-test.stage(validate-and-set-parameters, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -22,7 +22,7 @@ perf-test.stash({includes=messages/*, name=messages-perf-test}) perf-test.echo(Skipping stage test-with-security) perf-test.stage(test-without-security, groovy.lang.Closure) - perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + perf-test.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) perf-test.script(groovy.lang.Closure) perf-test.downloadBuildManifest({url=test://artifact.url, path=tests/jenkins/data/opensearch-1.3.0-non-security-bundle.yml}) downloadBuildManifest.legacySCM(groovy.lang.Closure) @@ -84,7 +84,7 @@ Performance tests without security for 1236 completed}) uploadTestResults.stash({includes=messages/*, name=messages-test_stage}) perf-test.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) - perf-test.node(Jenkins-Agent-al2-x64-c54xlarge-Docker-Host, groovy.lang.Closure) + perf-test.node(Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host, groovy.lang.Closure) perf-test.script(groovy.lang.Closure) Messages.asBoolean() Messages.get([perf-test]) diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt index 82a4172d01..27bed9474a 100644 --- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDocker.jenkinsfile.txt @@ -3,7 +3,7 @@ promote-docker-ecr.library({identifier=jenkins@20211123, retriever=null}) promote-docker-ecr.pipeline(groovy.lang.Closure) promote-docker-ecr.timeout({time=1, unit=HOURS}) - promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure) promote-docker-ecr.script(groovy.lang.Closure) promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt index 71fd2d49fe..20188ec551 100644 --- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerECRLatestMajor.jenkinsfile.txt @@ -3,7 +3,7 @@ promote-docker-ecr.library({identifier=jenkins@20211123, retriever=null}) promote-docker-ecr.pipeline(groovy.lang.Closure) promote-docker-ecr.timeout({time=1, unit=HOURS}) - promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure) promote-docker-ecr.script(groovy.lang.Closure) promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt index 07f3414b4c..72461fb19c 100644 --- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatest.jenkinsfile.txt @@ -3,7 +3,7 @@ promote-docker-ecr.library({identifier=jenkins@20211123, retriever=null}) promote-docker-ecr.pipeline(groovy.lang.Closure) promote-docker-ecr.timeout({time=1, unit=HOURS}) - promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure) promote-docker-ecr.script(groovy.lang.Closure) promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt index 2fa321661e..b0aff85140 100644 --- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerLatestMajor.jenkinsfile.txt @@ -3,7 +3,7 @@ promote-docker-ecr.library({identifier=jenkins@20211123, retriever=null}) promote-docker-ecr.pipeline(groovy.lang.Closure) promote-docker-ecr.timeout({time=1, unit=HOURS}) - promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure) promote-docker-ecr.script(groovy.lang.Closure) promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt index 495809ec10..fa3dbdb931 100644 --- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToDockerMajor.jenkinsfile.txt @@ -3,7 +3,7 @@ promote-docker-ecr.library({identifier=jenkins@20211123, retriever=null}) promote-docker-ecr.pipeline(groovy.lang.Closure) promote-docker-ecr.timeout({time=1, unit=HOURS}) - promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure) promote-docker-ecr.script(groovy.lang.Closure) promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt index 9a20ce0fad..3e740131c8 100644 --- a/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/promotion/promote-container/promote-container-testPromoteContainerToECRLatestMajor.jenkinsfile.txt @@ -3,7 +3,7 @@ promote-docker-ecr.library({identifier=jenkins@20211123, retriever=null}) promote-docker-ecr.pipeline(groovy.lang.Closure) promote-docker-ecr.timeout({time=1, unit=HOURS}) - promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-docker-ecr.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.6.3-qemu5.0-awscli1.22-jdk11-v2, reuseNode:false, stages:[:], args:-u root -v /var/run/docker.sock:/var/run/docker.sock, alwaysPull:false, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-docker-ecr.stage(Parameters Check, groovy.lang.Closure) promote-docker-ecr.script(groovy.lang.Closure) promote-docker-ecr.stage(image-promote-to-prod, groovy.lang.Closure) diff --git a/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag-dashboards.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag-dashboards.jenkinsfile.txt index c2dc7861a3..22d55cfe99 100644 --- a/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag-dashboards.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag-dashboards.jenkinsfile.txt @@ -3,7 +3,7 @@ release-tag.library({identifier=jenkins@20211123, retriever=null}) release-tag.pipeline(groovy.lang.Closure) release-tag.timeout({time=2, unit=HOURS}) - release-tag.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + release-tag.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) release-tag.stage(Create Release Tag, groovy.lang.Closure) release-tag.script(groovy.lang.Closure) release-tag.sh(curl -SLO https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.0.0-rc1/opensearch-dashboards-2.0.0-rc1-linux-x64.tar.gz && tar -xf opensearch-dashboards-2.0.0-rc1-linux-x64.tar.gz opensearch-dashboards-2.0.0-rc1/manifest.yml) diff --git a/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag.jenkinsfile.txt index 3245fd5cf5..c6d39340e0 100644 --- a/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/release-tag/release-tag.jenkinsfile.txt @@ -3,7 +3,7 @@ release-tag.library({identifier=jenkins@20211123, retriever=null}) release-tag.pipeline(groovy.lang.Closure) release-tag.timeout({time=2, unit=HOURS}) - release-tag.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + release-tag.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211130, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) release-tag.stage(Create Release Tag, groovy.lang.Closure) release-tag.script(groovy.lang.Closure) release-tag.sh(curl -SLO https://artifacts.opensearch.org/releases/bundle/opensearch/1.1.0/opensearch-1.1.0-linux-x64.tar.gz && tar -xf opensearch-1.1.0-linux-x64.tar.gz opensearch-1.1.0/manifest.yml) diff --git a/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt index 1786b63b84..c9950f67ec 100644 --- a/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt @@ -3,7 +3,7 @@ sign-standalone-artifacts.library({identifier=jenkins@20211123, retriever=null}) sign-standalone-artifacts.pipeline(groovy.lang.Closure) sign-standalone-artifacts.credentials(jenkins-artifact-bucket-name) - sign-standalone-artifacts.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + sign-standalone-artifacts.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v2, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) sign-standalone-artifacts.stage(sign, groovy.lang.Closure) sign-standalone-artifacts.script(groovy.lang.Closure) sign-standalone-artifacts.sh(mkdir /tmp/workspace/artifacts) diff --git a/tests/jenkins/jobs/Build_OpenSearch_Dashboards_Jenkinsfile b/tests/jenkins/jobs/Build_OpenSearch_Dashboards_Jenkinsfile index 61fd1c0786..65599680cf 100644 --- a/tests/jenkins/jobs/Build_OpenSearch_Dashboards_Jenkinsfile +++ b/tests/jenkins/jobs/Build_OpenSearch_Dashboards_Jenkinsfile @@ -18,7 +18,7 @@ pipeline { stage('detect docker image + args') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028' alwaysPull true } @@ -35,7 +35,7 @@ pipeline { stage('build-linux-x64') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image dockerAgent.image args dockerAgent.args alwaysPull true @@ -67,7 +67,7 @@ pipeline { stage('build-archive-linux-arm64') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image dockerAgent.image args dockerAgent.args alwaysPull true @@ -92,7 +92,7 @@ pipeline { stage('assemble-archive-linux-arm64') { agent { docker { - label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host' image dockerAgent.image args dockerAgent.args alwaysPull true @@ -124,7 +124,7 @@ pipeline { } stage('docker build') { steps { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + node('Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') { script { buildDockerImage( inputManifest: "manifests/${INPUT_MANIFEST}", @@ -138,7 +138,7 @@ pipeline { } post { success { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + node('Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') { script { def stashed = lib.jenkins.Messages.new(this).get([ 'build-linux-x64', @@ -153,7 +153,7 @@ pipeline { } } failure { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + node('Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') { script { echo 'FAILURE' diff --git a/tests/jenkins/jobs/ParallelMessages_Jenkinsfile b/tests/jenkins/jobs/ParallelMessages_Jenkinsfile index 18aa6d382e..d2adf8a1d6 100644 --- a/tests/jenkins/jobs/ParallelMessages_Jenkinsfile +++ b/tests/jenkins/jobs/ParallelMessages_Jenkinsfile @@ -7,7 +7,7 @@ pipeline { parallel { stage('build-on-host') { steps { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + node('Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') { script { def messages = lib.jenkins.Messages.new(this); messages.add("${STAGE_NAME}", "built ${STAGE_NAME}") @@ -18,7 +18,7 @@ pipeline { stage('build-snapshots') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'ubuntu:latest' alwaysPull } @@ -32,7 +32,7 @@ pipeline { stage('build-x86') { agent { docker { - label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host' image 'amazonlinux' alwaysPull } @@ -46,7 +46,7 @@ pipeline { stage('build-arm64') { agent { docker { - label 'Jenkins-Agent-al2-arm64-c6g4xlarge-Docker-Host' + label 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host' image 'ubuntu:jammy' alwaysPull } @@ -60,7 +60,7 @@ pipeline { } post() { success { - node('Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') { + node('Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') { script { def messages = lib.jenkins.Messages.new(this) def stashed = messages.get(['build-on-host', 'build-snapshots', 'build-x86', 'build-arm64']) diff --git a/tests/jenkins/jobs/data-prepper/promote-distribution-artifacts.jenkinsfile.txt b/tests/jenkins/jobs/data-prepper/promote-distribution-artifacts.jenkinsfile.txt index 9fbb333f10..9ab718aa30 100644 --- a/tests/jenkins/jobs/data-prepper/promote-distribution-artifacts.jenkinsfile.txt +++ b/tests/jenkins/jobs/data-prepper/promote-distribution-artifacts.jenkinsfile.txt @@ -2,7 +2,7 @@ promote-distribution-artifacts.legacySCM(groovy.lang.Closure) promote-distribution-artifacts.library({identifier=jenkins@20211123, retriever=null}) promote-distribution-artifacts.pipeline(groovy.lang.Closure) - promote-distribution-artifacts.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-al2-x64-c54xlarge-Docker-Host]]) + promote-distribution-artifacts.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:ci-runner-centos7-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]) promote-distribution-artifacts.stage(Download Staging Artifacts, groovy.lang.Closure) promote-distribution-artifacts.script(groovy.lang.Closure) promote-distribution-artifacts.sh(mkdir distribution) diff --git a/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy b/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy index 7a042d4c67..89e2a41037 100644 --- a/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy +++ b/tests/jenkins/lib-testers/RunPerfTestScriptLibTest.groovy @@ -38,7 +38,7 @@ class RunPerfTestScriptLibTester extends LibFunctionTester { c -> lib.jenkins.BuildManifest.new(readYaml(file: bundleManifest)) }) - binding.setVariable('AGENT_LABEL', 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host') + binding.setVariable('AGENT_LABEL', 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host') binding.setVariable('AGENT_IMAGE', 'opensearchstaging/ci-runner:ci-runner-centos7-v1') binding.setVariable('ARCHITECTURE', 'x64') binding.setVariable('ARTIFACT_BUCKET_NAME', 'test_bucket')