Re-add integration tests with OpenSeearch 1.x.

Signed-off-by: dblock <[email protected]>
opensearch-project · Apr 25, 2022 · ee9d6a1 · ee9d6a1
1 parent 52115ec
commit ee9d6a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -17,18 +17,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11 ]
+        entry:
+          # - { ref: '1.x', java: 11 }
+          # - { ref: '2.x', java: 11 }
+          - { ref: '2.0', java: 11 }
+          # - { ref: 'main', java: 11 }
     steps:
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK ${{ matrix.entry.java }}
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: ${{ matrix.entry.java }}
 
       - name: Checkout OpenSearch
         uses: actions/checkout@v2
         with:
-          repository: opensearch-project/opensearch
-          ref: ${{ env.OPENSEARCH_VERSION }}
+          repository: opensearch-project/OpenSearch
+          ref: ${{ matrix.entry.ref }}
           path: opensearch
 
       - name: Assemble OpenSearch

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -15,29 +15,32 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { opensearch_version: "", java: 11 }
+          # - { opensearch_version: 1.0.0, java: 11 }
+          # - { opensearch_version: 1.0.1, java: 11 }
+          # - { opensearch_version: 1.1.0, java: 11 }
+          # - { opensearch_version: 1.2.0, java: 11 }
+          # - { opensearch_version: 1.2.1, java: 11 }
+          # - { opensearch_version: 1.2.2, java: 11 }
+          # - { opensearch_version: 1.2.3, java: 11 }
+          # - { opensearch_version: 1.2.4, java: 11 }
+          - { opensearch_version: 1.3.0, java: 11 }
     steps:
       - name: Set up JDK ${{ matrix.java }}
-        if: ${{ matrix.entry.opensearch_version != ''}}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.entry.java }}
 
       - name: Checkout Branch
-        if: ${{ matrix.entry.opensearch_version != ''}}
         uses: actions/checkout@v2
 
       - name: Run Docker
-        if: ${{ matrix.entry.opensearch_version != ''}}
         run: |
           docker-compose --project-directory .ci/opensearch build --build-arg OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }}
           docker-compose --project-directory .ci/opensearch up -d
           sleep 60
       - name: Run Integration Test
-        if: ${{ matrix.entry.opensearch_version != ''}}
         run: ./gradlew clean integrationTest
 
       - name: Stop Docker
-        if: ${{ matrix.entry.opensearch_version != ''}}
         run: |
           docker-compose --project-directory .ci/opensearch down
diff --git a/.gitignore b/.gitignore
@@ -19,5 +19,6 @@ gradle-app.setting
 
 # vscode
 .vscode/
+java-client/
 
 .ci/output