From 4b8e3827a677d916a0a10207e02b80dda2ae1515 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 28 Jun 2024 11:57:47 -0400 Subject: [PATCH] Revert "Revert centos7 to al2 changes due to issues in 2.15.0 (#4760)" This reverts commit c968b8ef4a572f9255196a2635750684558a2c4c. Signed-off-by: Peter Zhu --- .github/workflows/get-ci-image-tag.yml | 2 +- jenkins/opensearch/integ-test.jenkinsfile | 2 +- manifests/2.15.0/opensearch-2.15.0.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/get-ci-image-tag.yml b/.github/workflows/get-ci-image-tag.yml index ce38e9ace7..ea5561905c 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="centos7" # Temp measure before al2 deprecation on opensearch for k-NN + PLATFORM="al2" # Temp measure before al2 deprecation on opensearch for k-NN else PLATFORM="almalinux8" fi diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile index d5975ac77d..3644780661 100644 --- a/jenkins/opensearch/integ-test.jenkinsfile +++ b/jenkins/opensearch/integ-test.jenkinsfile @@ -14,7 +14,7 @@ lib = library(identifier: 'jenkins@6.5.0', retriever: modernSCM([ ])) def docker_images = [ - 'tar': 'opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3', + 'tar': 'opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1', '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.15.0/opensearch-2.15.0.yml b/manifests/2.15.0/opensearch-2.15.0.yml index 0c24c762a5..ff764b90bb 100644 --- a/manifests/2.15.0/opensearch-2.15.0.yml +++ b/manifests/2.15.0/opensearch-2.15.0.yml @@ -5,7 +5,7 @@ build: version: 2.15.0 ci: image: - name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3 + name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1 args: -e JAVA_HOME=/opt/java/openjdk-21 components: - name: OpenSearch