From 6064639ddfea22b32c1b0a3c710132117e631f90 Mon Sep 17 00:00:00 2001 From: Finn Carroll Date: Tue, 26 Nov 2024 08:38:28 -0800 Subject: [PATCH 1/3] 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 5a67cf4..93bd17f 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 f3e7b89..e521b85 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 From 28b00b26f0c44163e8fa007b97c1f20f53d93a90 Mon Sep 17 00:00:00 2001 From: Finn Carroll Date: Tue, 26 Nov 2024 08:43:01 -0800 Subject: [PATCH 2/3] Forgot to add the actual start commands... Signed-off-by: Finn Carroll --- .github/workflows/multi-node-test-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index e521b85..0a5e51a 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -31,6 +31,8 @@ jobs: options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} uses: actions/setup-java@v3 From 23df874882dbd9e6a986cddf880b7eb5f483f04d Mon Sep 17 00:00:00 2001 From: Finn Carroll Date: Tue, 26 Nov 2024 08:46:37 -0800 Subject: [PATCH 3/3] Bump remaining checkout and setup-java GHAs to @v4 Signed-off-by: Finn Carroll --- .github/workflows/build.yml | 8 ++++---- .github/workflows/multi-node-test-workflow.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93bd17f..b214f9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set up JDK ${{ matrix.java }} for build and test - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} @@ -75,7 +75,7 @@ jobs: steps: # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} @@ -153,7 +153,7 @@ jobs: steps: # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} @@ -187,7 +187,7 @@ jobs: steps: # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 0a5e51a..97b725b 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -35,14 +35,14 @@ jobs: run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} # This step uses the setup-java Github action: https://github.com/actions/setup-java - name: Set Up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin # Temurin is a distribution of adoptium java-version: ${{ matrix.java }} # This step uses the checkout Github action: https://github.com/actions/checkout - name: Checkout Branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run integration tests with multi node config run: | chown -R 1000:1000 `pwd`