From 6382c1570cea3045b37e77ffca955b62f377cc7c Mon Sep 17 00:00:00 2001
From: "Daniel (dB.) Doubrovkine" <dblock@amazon.com>
Date: Thu, 15 Aug 2024 11:21:11 -0400
Subject: [PATCH] Fix integration tests with unreleased versions of OpenSearch.
 (#798)

Signed-off-by: dblock <dblock@amazon.com>
---
 .github/workflows/integration-unreleased.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration-unreleased.yml b/.github/workflows/integration-unreleased.yml
index 2d5b5b95..7f29e7c2 100644
--- a/.github/workflows/integration-unreleased.yml
+++ b/.github/workflows/integration-unreleased.yml
@@ -8,14 +8,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        opensearch_ref: [ '1.x', '2.x', 'main' ]
-        
+        entry:
+          - { branch: "1.x", java-version: "11" }
+          - { branch: "2.x", java-version: "17" }
+          - { branch: "main", java-version: "17" }
+
     steps:
       - name: Checkout OpenSearch
         uses: actions/checkout@v4
         with:
           repository: opensearch-project/opensearch
-          ref: ${{ matrix.opensearch_ref }}
+          ref: ${{ matrix.entry.branch }}
           path: opensearch
 
       - name: Get OpenSearch branch top
@@ -32,8 +35,8 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '11'
+          distribution: "temurin"
+          java-version: ${{ matrix.entry.java-version }}
 
       - name: Assemble OpenSearch
         if: steps.cache-restore.outputs.cache-hit != 'true'