Address code review comments

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Aug 15, 2024 · 871e153 · 871e153
1 parent 3d3b65b
commit 871e153
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -16,10 +16,12 @@ jobs:
       matrix:
         entry:
           - { opensearch_ref: '1.x', java: 11 }
-          - { opensearch_ref: '2.x', java: 11 }
+          # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
+          - { opensearch_ref: '2.x', java: 11, gradle-runtime: 17 }
           - { opensearch_ref: '2.x', java: 17 }
           - { opensearch_ref: '2.x', java: 21 }
-          - { opensearch_ref: 'main', java: 11 }
+          # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
+          - { opensearch_ref: 'main', java: 11, gradle-runtime: 17 }
           - { opensearch_ref: 'main', java: 17 }
           - { opensearch_ref: 'main', java: 21 }
     steps:
@@ -48,13 +50,13 @@ jobs:
           path: opensearch/distribution/archives/linux-tar/build/distributions
           key: ${{ steps.get-key.outputs.key }}
 
-      - name: Set up JDK 17
-        # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-        if: matrix.java == 11
+      - name: Set up Gradle JDK runtime
+        if: matrix.entry.gradle-runtime
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: ${{ matrix.entry.gradle-runtime }}
           distribution: temurin
+
       - name: Set JAVA${{ matrix.java }}_HOME
         shell: bash
         run: |