From 11a3c2a0d720988ea17aa4ae7a7695988daeb99e Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 12 Sep 2023 16:20:53 -0400 Subject: [PATCH 1/2] Switch OpenSearch Build Image Back to CentOS7 Signed-off-by: Peter Zhu --- manifests/2.10.0/opensearch-2.10.0-concurrent-search-test.yml | 2 +- manifests/2.10.0/opensearch-2.10.0-test.yml | 2 +- manifests/2.10.0/opensearch-2.10.0.yml | 2 +- manifests/2.11.0/opensearch-2.11.0.yml | 2 +- manifests/3.0.0/opensearch-3.0.0-test.yml | 2 +- manifests/3.0.0/opensearch-3.0.0.yml | 2 +- manifests/templates/opensearch/2.x/manifest.yml | 2 +- manifests/templates/opensearch/3.x/manifest.yml | 2 +- manifests/templates/opensearch/default/manifest.yml | 2 +- tests/tests_manifests_workflow/test_input_manifests.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/2.10.0/opensearch-2.10.0-concurrent-search-test.yml b/manifests/2.10.0/opensearch-2.10.0-concurrent-search-test.yml index e5f5dae90f..9c3bfeb230 100644 --- a/manifests/2.10.0/opensearch-2.10.0-concurrent-search-test.yml +++ b/manifests/2.10.0/opensearch-2.10.0-concurrent-search-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: index-management diff --git a/manifests/2.10.0/opensearch-2.10.0-test.yml b/manifests/2.10.0/opensearch-2.10.0-test.yml index 9a5171f1f8..ee3d4331dd 100644 --- a/manifests/2.10.0/opensearch-2.10.0-test.yml +++ b/manifests/2.10.0/opensearch-2.10.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: alerting diff --git a/manifests/2.10.0/opensearch-2.10.0.yml b/manifests/2.10.0/opensearch-2.10.0.yml index dcd4eaaccb..9f8a66d779 100644 --- a/manifests/2.10.0/opensearch-2.10.0.yml +++ b/manifests/2.10.0/opensearch-2.10.0.yml @@ -5,7 +5,7 @@ build: version: 2.10.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/2.11.0/opensearch-2.11.0.yml b/manifests/2.11.0/opensearch-2.11.0.yml index ab87bfef30..cd94ac4343 100644 --- a/manifests/2.11.0/opensearch-2.11.0.yml +++ b/manifests/2.11.0/opensearch-2.11.0.yml @@ -5,7 +5,7 @@ build: version: 2.11.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/3.0.0/opensearch-3.0.0-test.yml b/manifests/3.0.0/opensearch-3.0.0-test.yml index 9c06b07535..d0c36dba83 100644 --- a/manifests/3.0.0/opensearch-3.0.0-test.yml +++ b/manifests/3.0.0/opensearch-3.0.0-test.yml @@ -3,7 +3,7 @@ schema-version: '1.0' name: OpenSearch ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-20 components: - name: alerting diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index df3b4ba82f..ab2886d7e4 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-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-20 components: - name: OpenSearch diff --git a/manifests/templates/opensearch/2.x/manifest.yml b/manifests/templates/opensearch/2.x/manifest.yml index 2ed03bcb13..2db16e6b43 100644 --- a/manifests/templates/opensearch/2.x/manifest.yml +++ b/manifests/templates/opensearch/2.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/templates/opensearch/3.x/manifest.yml b/manifests/templates/opensearch/3.x/manifest.yml index 2ed03bcb13..2db16e6b43 100644 --- a/manifests/templates/opensearch/3.x/manifest.yml +++ b/manifests/templates/opensearch/3.x/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/manifests/templates/opensearch/default/manifest.yml b/manifests/templates/opensearch/default/manifest.yml index 2ed03bcb13..2db16e6b43 100644 --- a/manifests/templates/opensearch/default/manifest.yml +++ b/manifests/templates/opensearch/default/manifest.yml @@ -5,7 +5,7 @@ build: version: 'replace' ci: image: - name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4 + name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 args: -e JAVA_HOME=/opt/java/openjdk-17 components: - name: OpenSearch diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py index 880e70c45b..6d55ebc2c6 100644 --- a/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -60,7 +60,7 @@ def test_create_manifest_opensearch_from_default(self) -> None: { "schema-version": "1.0", "build": {"name": "OpenSearch", "version": "0.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-build-v4", + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3", "args": "-e JAVA_HOME=/opt/java/openjdk-17"}}, }, ) From 4bc7a9812855ed0be0d0ce8b0a9f1ffd8eb99931 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 12 Sep 2023 17:41:30 -0400 Subject: [PATCH 2/2] Add test cases to the changes here 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 a43a2a5229..50958174b2 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-rockylinux8-opensearch-build-v4 (-e JAVA_HOME=/opt/java/openjdk-20)) + detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 (-e JAVA_HOME=/opt/java/openjdk-20)) detectDockerAgent.echo(Using java version openjdk-20) release-notes-check.postCleanup() postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})