Test matrix

Signed-off-by: Daniel Widdis <[email protected]>
dbwiddis · Jan 27, 2024 · e3345a6 · e3345a6
1 parent f4fa29e
commit e3345a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 53 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -7,10 +7,11 @@ on:
       - 'backport/**'
   pull_request:
     types: [opened, synchronize, reopened]
+  workflow_dispatch:
 
 jobs:
   spotless:
-    if: github.repository == 'opensearch-project/flow-framework'
+    # if: github.repository == 'opensearch-project/flow-framework'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -22,70 +23,21 @@ jobs:
       - name: Spotless Check
         run: ./gradlew spotlessCheck
   javadoc:
-    if: github.repository == 'opensearch-project/flow-framework'
+    # if: github.repository == 'opensearch-project/flow-framework'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Javadoc CheckStyle
         run: ./gradlew checkstyleMain
       - name: Javadoc Check
         run: ./gradlew javadoc
-  build:
-    needs: [spotless, javadoc]
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 21]
-        include:
-          - os: ubuntu-latest
-            java: 17
-            codecov: yes
-    name: Test JDK${{ matrix.java }}, ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: temurin
-      - name: Build and Run Tests
-        run: |
-          ./gradlew check -x integTest -x yamlRestTest -x spotlessJava
-      - name: Upload Coverage Report
-        if: ${{ matrix.codecov }}
-        uses: codecov/codecov-action@v3
-        with:
-          file: ./build/reports/jacoco/test/jacocoTestReport.xml
-  integTest:
-    needs: [spotless, javadoc]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 21]
-        include:
-          - os: ubuntu-latest
-            java: 17
-    name: Integ Test JDK${{ matrix.java }}, ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: temurin
-      - name: Build and Run Tests
-        run: |
-          ./gradlew integTest yamlRestTest
   integMultiNodeTest:
     needs: [spotless, javadoc]
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [21]
+        java: [17, 18, 19, 20, 21]
     name: Multi-Node Integ Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java
@@ -74,7 +74,9 @@ public abstract class FlowFrameworkRestTestCase extends OpenSearchRestTestCase {
     private static RestClient fullAccessClient;
 
     @Before
-    protected void setUpSettings() throws Exception {
+    @Override
+    public void initClient() throws IOException {
+        super.initClient();
 
         // Enable Flow Framework Plugin Rest APIs
         Response response = TestHelpers.makeRequest(