diff --git a/.github/workflows/get-ci-image-tag.yml b/.github/workflows/get-ci-image-tag.yml index 691054d027..1487997d14 100644 --- a/.github/workflows/get-ci-image-tag.yml +++ b/.github/workflows/get-ci-image-tag.yml @@ -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 diff --git a/docker/ci/dockerfiles/legacy/build.centos7.opensearch.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.ppc64le.dockerfile similarity index 100% rename from docker/ci/dockerfiles/legacy/build.centos7.opensearch.x64.arm64.ppc64le.dockerfile rename to docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.ppc64le.dockerfile diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index a57edf233e..f8169a546c 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -14,7 +14,7 @@ lib = library(identifier: 'jenkins@6.3.2', 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', diff --git a/manifests/2.14.0/opensearch-2.14.0-test.yml b/manifests/2.14.0/opensearch-2.14.0-test.yml index d2f5cdc3d3..25cc666956 100644 --- a/manifests/2.14.0/opensearch-2.14.0-test.yml +++ b/manifests/2.14.0/opensearch-2.14.0-test.yml @@ -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 diff --git a/manifests/2.14.0/opensearch-2.14.0.yml b/manifests/2.14.0/opensearch-2.14.0.yml index 4016f3682b..fe090e1ba8 100644 --- a/manifests/2.14.0/opensearch-2.14.0.yml +++ b/manifests/2.14.0/opensearch-2.14.0.yml @@ -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 diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml index aff06a6e9e..b3e7d6d23f 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-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 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 08f90dae43..b7f0193377 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-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})