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.

Sign up for GitHub

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

Revert #4651 #4654 and partially #4657 for KNN to use CentOS7 in 2.14.0 #4667

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Revert #4651 #4654 and partially #4657 for KNN to use CentOS7 in 2.14.0 #4667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
974fdb7
Revert "Switch 3.0.0 to also use almalinux8 on opensearch (#4651)"
peterzhuamazon Apr 30, 2024
68c266e
Revert "Use almalinux8 docker images for 2.14.0 builds (#4645)"
peterzhuamazon Apr 30, 2024
a5cb681
Revert #4651 #4654 and partially #4657 for KNN to use CentOS7 in 2.14.0
peterzhuamazon Apr 30, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/get-ci-image-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
TYPE=${{ inputs.type }}
if [[ -z "$PLATFORM" ]]; then
if [[ "$PRODUCT" = "opensearch" ]]; then
PLATFORM="almalinux8" # Temp measure before centos7 deprecation on opensearch for k-NN
PLATFORM="centos7" # Temp measure before centos7 deprecation on opensearch for k-NN
else
PLATFORM="almalinux8"
fi
Expand Down
0 ...7.opensearch.x64.arm64.ppc64le.dockerfile → ...7.opensearch.x64.arm64.ppc64le.dockerfile
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion jenkins/opensearch/integ-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ lib = library(identifier: '[email protected]', retriever: modernSCM([
]))

def docker_images = [
'tar': 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1',
'tar': 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-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-opensearch-build-v1',
Expand Down
2 changes: 1 addition & 1 deletion manifests/2.14.0/opensearch-2.14.0-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema-version: '1.0'
name: OpenSearch
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
args: -e JAVA_HOME=/opt/java/openjdk-21
components:
- name: alerting
Expand Down
2 changes: 1 addition & 1 deletion manifests/2.14.0/opensearch-2.14.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 2.14.0
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
args: -e JAVA_HOME=/opt/java/openjdk-21
components:
- name: OpenSearch
Expand Down
2 changes: 1 addition & 1 deletion manifests/3.0.0/opensearch-3.0.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
version: 3.0.0
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1
name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
args: -e JAVA_HOME=/opt/java/openjdk-21
components:
- name: OpenSearch
Expand Down
2 changes: 1 addition & 1 deletion ...nkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
detectDockerAgent.library({[email protected], 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-almalinux8-opensearch-build-v1 (-e JAVA_HOME=/opt/java/openjdk-21))
detectDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 (-e JAVA_HOME=/opt/java/openjdk-21))
detectDockerAgent.echo(Using java version openjdk-21)
release-notes-check.postCleanup()
postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
Expand Down
Loading