From 6064639ddfea22b32c1b0a3c710132117e631f90 Mon Sep 17 00:00:00 2001 From: Finn Carroll Date: Tue, 26 Nov 2024 08:38:28 -0800 Subject: [PATCH] Apply opensearch-build container fix to multi-node-test-workflow Signed-off-by: Finn Carroll --- .github/workflows/build.yml | 3 +-- .github/workflows/multi-node-test-workflow.yml | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a67cf4b..93bd17f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,15 +21,14 @@ jobs: needs: Get-CI-Image-Tag # Job name name: Linux - Build Asynchronous Search - # This job runs on Linux. outputs: build-test-linux: ${{ steps.step-build-test-linux.outputs.build-test-linux }} + # This job runs on Linux. runs-on: ubuntu-latest container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} - # need to switch to root so that github actions can install runner binary on container without permission issues. options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index f3e7b897..e521b858 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -19,8 +19,8 @@ jobs: strategy: matrix: java: [ 21 ] - # Job name needs: Get-CI-Image-Tag + # Job name name: Build Asynchronous Search # This job runs on Linux runs-on: ubuntu-latest @@ -28,15 +28,7 @@ jobs: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} - # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root - - # actions/checkout@v4 and actions/setup-java@v4 use node 20: - # https://github.com/actions/checkout/releases/tag/v4.0.0 - # container image does not have GLIBC_2.28 required for this node version - # as such use @v3 actions instead for this workflow and set ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: # This step uses the setup-java Github action: https://github.com/actions/setup-java