From cfbdc128c9f61b9b73faf423a127e68b6a9679ed Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 12 Mar 2024 20:34:36 +0000 Subject: [PATCH] Switch ci images to almalinux8/windows2019/ubuntu20.04 Signed-off-by: Peter Zhu --- .github/workflows/get-ci-image-tag.yml | 2 +- jenkins/docker/docker-build.jenkinsfile | 4 ++-- jenkins/docker/docker-copy.jenkinsfile | 2 +- jenkins/docker/docker-re-release.jenkinsfile | 2 +- jenkins/docker/docker-scan.jenkinsfile | 2 +- .../opensearch-dashboards/distribution-build.jenkinsfile | 4 ++-- jenkins/opensearch-dashboards/integ-test.jenkinsfile | 6 +++--- jenkins/opensearch/distribution-build.jenkinsfile | 4 ++-- jenkins/opensearch/integ-test.jenkinsfile | 4 ++-- jenkins/opensearch/publish-min-snapshots.jenkinsfile | 2 +- jenkins/packer/packer-build.jenkinsfile | 2 +- jenkins/promotion/promote-docker-ecr.jenkinsfile | 2 +- jenkins/promotion/promote-repos.jenkinsfile | 2 +- jenkins/rpm-validation/rpm-validation.jenkinsfile | 2 +- .../sign-artifacts/sign-standalone-artifacts.jenkinsfile | 2 +- jenkins/validate-artifacts/validate-artifacts.jenkinsfile | 8 ++++---- manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml | 2 +- manifests/2.13.0/opensearch-dashboards-2.13.0.yml | 2 +- .../templates/opensearch-dashboards/2.x/manifest.yml | 2 +- .../templates/opensearch-dashboards/3.x/manifest.yml | 2 +- .../templates/opensearch-dashboards/default/manifest.yml | 2 +- tests/jenkins/TestDockerBuild.groovy | 2 +- tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy | 2 +- tests/jenkins/TestPublishMinSnapshots.groovy | 2 +- .../docker/docker-build.jenkinsfile.txt | 2 +- .../opensearch/publish-min-snapshots.jenkinsfile.txt | 2 +- .../packer/packer-build.jenkinsfile.txt | 2 +- ...container-testPromoteContainerToDocker.jenkinsfile.txt | 2 +- ...PromoteContainerToDockerECRLatestMajor.jenkinsfile.txt | 2 +- ...ner-testPromoteContainerToDockerLatest.jenkinsfile.txt | 2 +- ...estPromoteContainerToDockerLatestMajor.jenkinsfile.txt | 2 +- ...iner-testPromoteContainerToDockerMajor.jenkinsfile.txt | 2 +- ...r-testPromoteContainerToECRLatestMajor.jenkinsfile.txt | 2 +- .../sign-standalone-artifacts.jenkinsfile.txt | 2 +- tests/tests_manifests_workflow/test_input_manifests.py | 2 +- 35 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/get-ci-image-tag.yml b/.github/workflows/get-ci-image-tag.yml index 02185b268e..1487997d14 100644 --- a/.github/workflows/get-ci-image-tag.yml +++ b/.github/workflows/get-ci-image-tag.yml @@ -52,7 +52,7 @@ jobs: if [[ "$PRODUCT" = "opensearch" ]]; then PLATFORM="centos7" # Temp measure before centos7 deprecation on opensearch for k-NN else - PLATFORM="rockylinux8" + PLATFORM="almalinux8" fi fi crane version diff --git a/jenkins/docker/docker-build.jenkinsfile b/jenkins/docker/docker-build.jenkinsfile index eb040812c3..b3f43e02f1 100644 --- a/jenkins/docker/docker-build.jenkinsfile +++ b/jenkins/docker/docker-build.jenkinsfile @@ -8,8 +8,8 @@ */ def docker_images = [ - "linux": "opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1", - "windows": "opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1" + "linux": "opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1", + "windows": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1" ] def docker_args = [ diff --git a/jenkins/docker/docker-copy.jenkinsfile b/jenkins/docker/docker-copy.jenkinsfile index 8119754ff6..5e1d59b1c3 100644 --- a/jenkins/docker/docker-copy.jenkinsfile +++ b/jenkins/docker/docker-copy.jenkinsfile @@ -49,7 +49,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1' + image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/docker/docker-re-release.jenkinsfile b/jenkins/docker/docker-re-release.jenkinsfile index 4f8cfaa53f..14baea3a95 100644 --- a/jenkins/docker/docker-re-release.jenkinsfile +++ b/jenkins/docker/docker-re-release.jenkinsfile @@ -42,7 +42,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder' - image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1' + image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/docker/docker-scan.jenkinsfile b/jenkins/docker/docker-scan.jenkinsfile index 2e3d56d82c..e368d4f6b0 100644 --- a/jenkins/docker/docker-scan.jenkinsfile +++ b/jenkins/docker/docker-scan.jenkinsfile @@ -29,7 +29,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1' + image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile index 955efeaa82..f5b94729d1 100644 --- a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile +++ b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile @@ -21,9 +21,9 @@ pipeline { AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host' AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host' - IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8 already + IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper - IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1' // required for windows to build zip distribution + IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution JOB_NAME_OPENSEARCH = 'distribution-build-opensearch' } parameters { diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile index fc8c1ff126..c40da106cc 100644 --- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile +++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile @@ -14,10 +14,10 @@ lib = library(identifier: 'jenkins@6.3.2', retriever: modernSCM([ ])) def docker_images = [ - "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", + "tar": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-integtest-v1", + "rpm": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1", "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3", - "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1", + "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1", ] def docker_args = [ diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile index e9083859df..e9ca358c71 100644 --- a/jenkins/opensearch/distribution-build.jenkinsfile +++ b/jenkins/opensearch/distribution-build.jenkinsfile @@ -21,9 +21,9 @@ pipeline { AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host' AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host' - IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8 already + IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper - IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1' // required for windows to build zip distribution + IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution } parameters { string( diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index 97ba80c2a9..1a9e141703 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -15,9 +15,9 @@ lib = library(identifier: 'jenkins@6.3.2', retriever: modernSCM([ def docker_images = [ 'tar': 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3', - 'rpm': 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3', + 'rpm': 'opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1', 'deb': 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3', - 'zip': 'opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1', + 'zip': 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1', ] def docker_args = [ diff --git a/jenkins/opensearch/publish-min-snapshots.jenkinsfile b/jenkins/opensearch/publish-min-snapshots.jenkinsfile index dd692afaab..8325cd56fe 100644 --- a/jenkins/opensearch/publish-min-snapshots.jenkinsfile +++ b/jenkins/opensearch/publish-min-snapshots.jenkinsfile @@ -22,7 +22,7 @@ pipeline { AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host' AGENT_MACOS_X64 = 'Jenkins-Agent-MacOS12-X64-Mac1Metal-Multi-Host' AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host' - IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1' // required for windows to build zip distribution + IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution } parameters { string( diff --git a/jenkins/packer/packer-build.jenkinsfile b/jenkins/packer/packer-build.jenkinsfile index 5601a5f1d2..fd74370a1e 100644 --- a/jenkins/packer/packer-build.jenkinsfile +++ b/jenkins/packer/packer-build.jenkinsfile @@ -19,7 +19,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder' - image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1' + image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1' registryUrl 'https://public.ecr.aws/' alwaysPull true } diff --git a/jenkins/promotion/promote-docker-ecr.jenkinsfile b/jenkins/promotion/promote-docker-ecr.jenkinsfile index b382b54d34..f1743384bd 100644 --- a/jenkins/promotion/promote-docker-ecr.jenkinsfile +++ b/jenkins/promotion/promote-docker-ecr.jenkinsfile @@ -19,7 +19,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1' + image 'opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1' registryUrl 'https://public.ecr.aws/' args '-u root -v /var/run/docker.sock:/var/run/docker.sock' } diff --git a/jenkins/promotion/promote-repos.jenkinsfile b/jenkins/promotion/promote-repos.jenkinsfile index 8ce62d835b..ba199266b0 100644 --- a/jenkins/promotion/promote-repos.jenkinsfile +++ b/jenkins/promotion/promote-repos.jenkinsfile @@ -13,7 +13,7 @@ lib = library(identifier: 'jenkins@2.0.2', retriever: modernSCM([ ])) def docker_images = [ - "yum": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4", + "yum": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1", "apt": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2", ] diff --git a/jenkins/rpm-validation/rpm-validation.jenkinsfile b/jenkins/rpm-validation/rpm-validation.jenkinsfile index f7d2ea1034..6f4d35db70 100644 --- a/jenkins/rpm-validation/rpm-validation.jenkinsfile +++ b/jenkins/rpm-validation/rpm-validation.jenkinsfile @@ -36,7 +36,7 @@ pipeline { agent { docker { label AGENT_LABEL - image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3' + image 'opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1' args '--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host' registryUrl 'https://public.ecr.aws/' alwaysPull true diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile index 3e7b33d8e3..8979ef8f35 100644 --- a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile +++ b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile @@ -16,7 +16,7 @@ pipeline { agent { docker { label 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host' - image 'opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4' + image 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' registryUrl 'https://public.ecr.aws/' alwaysPull true } diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile index 555dfef087..3d108e60e9 100644 --- a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile +++ b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile @@ -13,10 +13,10 @@ lib = library(identifier: 'jenkins@6.3.2', retriever: modernSCM([ ])) def docker_images = [ - "tar": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4", - "rpm": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", - "yum": "opensearchstaging/ci-runner:ci-runner-rockylinux8-systemd-base-integtest-v3", - "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1", + "tar": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-integtest-v1", + "rpm": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1", + "yum": "opensearchstaging/ci-runner:ci-runner-almalinux8-systemd-base-integtest-v1", + "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1", "deb": "opensearchstaging/ci-runner:ci-runner-ubuntu2004-systemd-base-integtest-v3" ] diff --git a/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml b/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml index bd779fb6d2..7fcfac61a0 100644 --- a/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml +++ b/manifests/2.13.0/opensearch-dashboards-2.13.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch Dashboards ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4 + name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-integtest-v1 components: - name: OpenSearch-Dashboards integ-test: diff --git a/manifests/2.13.0/opensearch-dashboards-2.13.0.yml b/manifests/2.13.0/opensearch-dashboards-2.13.0.yml index 06ddaa1fb2..0d6b9e310b 100644 --- a/manifests/2.13.0/opensearch-dashboards-2.13.0.yml +++ b/manifests/2.13.0/opensearch-dashboards-2.13.0.yml @@ -5,7 +5,7 @@ build: version: 2.13.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1 + name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-build-v1 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/2.x/manifest.yml b/manifests/templates/opensearch-dashboards/2.x/manifest.yml index 2622bd13b3..c7ec38854d 100644 --- a/manifests/templates/opensearch-dashboards/2.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/2.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1 + name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-build-v1 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/3.x/manifest.yml b/manifests/templates/opensearch-dashboards/3.x/manifest.yml index 5e684ee32b..4b4e47c614 100644 --- a/manifests/templates/opensearch-dashboards/3.x/manifest.yml +++ b/manifests/templates/opensearch-dashboards/3.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1 + name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-build-v1 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/manifests/templates/opensearch-dashboards/default/manifest.yml b/manifests/templates/opensearch-dashboards/default/manifest.yml index 2622bd13b3..c7ec38854d 100644 --- a/manifests/templates/opensearch-dashboards/default/manifest.yml +++ b/manifests/templates/opensearch-dashboards/default/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1 + name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-build-v1 components: - name: OpenSearch-Dashboards repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git diff --git a/tests/jenkins/TestDockerBuild.groovy b/tests/jenkins/TestDockerBuild.groovy index 53810b0bbf..ef9565cd91 100644 --- a/tests/jenkins/TestDockerBuild.groovy +++ b/tests/jenkins/TestDockerBuild.groovy @@ -68,7 +68,7 @@ class TestDockerBuild extends BuildPipelineTest { assertCallStack().contains("docker-build.sh(echo Account: jenkins-staging-dockerhub-credential)") // Make sure dockerBuildOS is deciding agent_node docker_nodes docker_args correctly - assertCallStack().contains("docker-build.echo(Executing on agent [docker:[alwaysPull:true, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])") + assertCallStack().contains("docker-build.echo(Executing on agent [docker:[alwaysPull:true, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])") printCallStack() } diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy index bda9921e99..815331d9e7 100644 --- a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy +++ b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy @@ -71,7 +71,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest { binding.setVariable('COMPONENT_NAME', '' ) binding.getVariable('currentBuild').upstreamBuilds = [[fullProjectName: jobName]] def env = binding.getVariable('env') - env['DOCKER_AGENT'] = [image:'opensearchstaging/opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2', args:'-e JAVA_HOME=/opt/java/openjdk-11'] + env['DOCKER_AGENT'] = [image:'opensearchstaging/opensearchstaging/ci-runner:ci-runner-almallinux8-opensearch-dashboards-integtest-v1', args:'-e JAVA_HOME=/opt/java/openjdk-11'] env['PUBLIC_ARTIFACT_URL'] = 'DUMMY_PUBLIC_ARTIFACT_URL' env['JOB_NAME'] = 'dummy_job' diff --git a/tests/jenkins/TestPublishMinSnapshots.groovy b/tests/jenkins/TestPublishMinSnapshots.groovy index ceca998a30..c1fe053bc1 100644 --- a/tests/jenkins/TestPublishMinSnapshots.groovy +++ b/tests/jenkins/TestPublishMinSnapshots.groovy @@ -41,7 +41,7 @@ class TestPublishMinSnapshots extends BuildPipelineTest { binding.setVariable('AGENT_LINUX_ARM64', 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host') binding.setVariable('AGENT_MACOS_X64', 'Jenkins-Agent-MacOS12-X64-Mac1Metal-Multi-Host') binding.setVariable('AGENT_WINDOWS_X64', 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host') - binding.setVariable('IMAGE_WINDOWS_ZIP', 'opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1') + binding.setVariable('IMAGE_WINDOWS_ZIP', 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1') binding.setVariable('ARTIFACT_PRODUCTION_BUCKET_NAME', 'production-s3-bucket-name') binding.setVariable('ARTIFACT_PROMOTION_ROLE_NAME', 'production-role-name') binding.setVariable('AWS_ACCOUNT_ARTIFACT', 'aws-account-artifact') diff --git a/tests/jenkins/jenkinsjob-regression-files/docker/docker-build.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/docker/docker-build.jenkinsfile.txt index 26bf0fdc08..272ef1ea51 100644 --- a/tests/jenkins/jenkinsjob-regression-files/docker/docker-build.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/docker/docker-build.jenkinsfile.txt @@ -5,7 +5,7 @@ docker-build.stage(Parameters Check, groovy.lang.Closure) docker-build.script(groovy.lang.Closure) docker-build.stage(docker-build, groovy.lang.Closure) - docker-build.echo(Executing on agent [docker:[alwaysPull:true, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + docker-build.echo(Executing on agent [docker:[alwaysPull:true, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) docker-build.script(groovy.lang.Closure) docker-build.echo(The docker-build workflow will only push docker images to staging, please use docker-copy to move the image to other repositories) docker-build.checkout({$class=GitSCM, branches=[{name=main}], userRemoteConfigs=[{url=https://github.com/opensearch-project/opensearch-build}]}) diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt index 9f3206b498..74fca36bca 100644 --- a/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/opensearch/publish-min-snapshots.jenkinsfile.txt @@ -126,7 +126,7 @@ publish-min-snapshots.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true}) publish-min-snapshots.stage(windows-x64-zip, groovy.lang.Closure) - publish-min-snapshots.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + publish-min-snapshots.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) publish-min-snapshots.script(groovy.lang.Closure) publish-min-snapshots.echo(Switching to Java 17 on Windows Docker Container) publish-min-snapshots.sh(scoop reset `scoop list jdk | cut -d ' ' -f1 | grep 17 | head -1`) diff --git a/tests/jenkins/jenkinsjob-regression-files/packer/packer-build.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/packer/packer-build.jenkinsfile.txt index 6472c5b1ca..332d5907d5 100644 --- a/tests/jenkins/jenkinsjob-regression-files/packer/packer-build.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/packer/packer-build.jenkinsfile.txt @@ -3,7 +3,7 @@ packer-build.library({identifier=jenkins@2.2.0, retriever=null}) packer-build.pipeline(groovy.lang.Closure) packer-build.timeout({time=4, unit=HOURS}) - packer-build.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + packer-build.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) packer-build.stage(Parameters Check, groovy.lang.Closure) packer-build.script(groovy.lang.Closure) packer-build.stage(packer-build, groovy.lang.Closure) 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 a262396f8b..db1d1c1f0b 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@1.0.4, 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:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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 48043c2ee5..a577a12493 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@1.0.4, 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:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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 a377158609..9a76755bc3 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@1.0.4, 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:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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 28963dc47f..2b5179f416 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@1.0.4, 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:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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 656cb74879..21a920edf7 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@1.0.4, 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:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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 f6c4b46c66..a85d4b4f38 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@1.0.4, 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:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-awscli1.22-jdk11-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + promote-docker-ecr.echo(Executing on agent [docker:[alwaysPull:false, args:-u root -v /var/run/docker.sock:/var/run/docker.sock, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ubuntu2004-x64-docker-buildx0.9.1-qemu5.0-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/sign-standalone-artifacts/sign-standalone-artifacts.jenkinsfile.txt index 24bbe2c12d..dd0acdede4 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@1.0.4, 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:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) + sign-standalone-artifacts.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]]) 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/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py index e6116afc4a..be02a276b9 100644 --- a/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -85,7 +85,7 @@ def test_create_manifest_opensearch_dashboards_from_default(self) -> None: { "schema-version": "1.1", "build": {"name": "OpenSearch Dashboards", "version": "4.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1", }}, + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-dashboards-build-v1", }}, }, )