Updating workflows and removing exists_type

Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Apr 1, 2022 · d82f4b6 · d82f4b6
1 parent a8d1300
commit d82f4b6
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 504 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
 
-     - name: Checkout Branch
+      - name: Checkout Branch
         uses: actions/checkout@v2
 
       - name: Build with Gradle

diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 14]
+        java: [ 11 ]
     steps:
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
@@ -31,7 +31,7 @@ jobs:
           ref: ${{ env.OPENSEARCH_VERSION }}
           path: opensearch
 
-      - name: Assemble OpenSearch and Publish to Maven Local
+      - name: Assemble OpenSearch
         run: |
           cd opensearch
           ./gradlew assemble

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -15,36 +15,29 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { 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 }
+          - { opensearch_version: "", java: 11 }
     steps:
-      - name: Set up JDK ${{ matrix.entry.java }}
+      - 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.opensearch_version != ''}}
+        if: ${{ matrix.entry.opensearch_version != ''}}
         uses: actions/checkout@v2
 
       - name: Run Docker
-        if: ${{ matrix.opensearch_version != ''}}
+        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.opensearch_version != ''}}
+        if: ${{ matrix.entry.opensearch_version != ''}}
         run: ./gradlew clean integrationTest
 
       - name: Stop Docker
-        if: ${{ matrix.opensearch_version != ''}}
+        if: ${{ matrix.entry.opensearch_version != ''}}
         run: |
           docker-compose --project-directory .ci/opensearch down
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -123,7 +123,7 @@ val integrationTest = task<Test>("integrationTest") {
 
 dependencies {
 
-    val opensearchVersion = "2.0.0-alpha1-SNAPSHOT"
+    val opensearchVersion = "2.0.0-SNAPSHOT"
     val jacksonVersion = "2.12.6"
     val jacksonDatabindVersion = "2.12.6.1"