From 82e5563009d1dd0bd8ce7957b2581b8678f0c69b Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 23 Apr 2024 13:21:15 -0400 Subject: [PATCH 1/2] Switch 3.0.0 to also use almalinux8 on opensearch Signed-off-by: Peter Zhu --- manifests/3.0.0/opensearch-3.0.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index 1e922e2ca8..e847830d1c 100644 --- a/manifests/3.0.0/opensearch-3.0.0.yml +++ b/manifests/3.0.0/opensearch-3.0.0.yml @@ -5,7 +5,7 @@ build: version: 3.0.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 + name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1 args: -e JAVA_HOME=/opt/java/openjdk-21 components: - name: OpenSearch From 0448a2d48ef7eede1f39c6ec802c161db453a416 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 23 Apr 2024 14:28:55 -0400 Subject: [PATCH 2/2] Update test Signed-off-by: Peter Zhu --- .../release-notes-check/release-notes-check.jenkinsfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jenkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt index b7f0193377..08f90dae43 100644 --- a/tests/jenkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt @@ -12,7 +12,7 @@ detectDockerAgent.library({identifier=jenkins@1.0.4, retriever=null}) detectDockerAgent.readYaml({file=manifests/3.0.0/opensearch-3.0.0.yml}) InputManifest.asBoolean() - detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 (-e JAVA_HOME=/opt/java/openjdk-21)) + detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1 (-e JAVA_HOME=/opt/java/openjdk-21)) detectDockerAgent.echo(Using java version openjdk-21) release-notes-check.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})