Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch OpenSearch Build Image Back to CentOS7 #4002

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/2.10.0/opensearch-2.10.0-test.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/2.10.0/opensearch-2.10.0.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/2.11.0/opensearch-2.11.0.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/3.0.0/opensearch-3.0.0-test.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/3.0.0/opensearch-3.0.0.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/templates/opensearch/2.x/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/templates/opensearch/3.x/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion manifests/templates/opensearch/default/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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})
2 changes: 1 addition & 1 deletion tests/tests_manifests_workflow/test_input_manifests.py
Original file line number Diff line number Diff line change
@@ -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"}},
},
)