Revert #4651 #4654 and partially #4657 for KNN to use CentOS7 in 2.14…

….0 (#4667) Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Apr 30, 2024 · 5991cae · 5991cae
1 parent 23e8018
commit 5991cae
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git 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/...7.opensearch.x64.arm64.ppc64le.dockerfile → ...7.opensearch.x64.arm64.ppc64le.dockerfile b/...7.opensearch.x64.arm64.ppc64le.dockerfile → ...7.opensearch.x64.arm64.ppc64le.dockerfile
diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -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',

diff --git 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
@@ -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
@@ -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/...nkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt b/...nkins/jenkinsjob-regression-files/release-notes-check/release-notes-check.jenkinsfile.txt
@@ -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})