squash flink test

mchades · Jun 6, 2024 · 7ba7161 · 7ba7161
1 parent 5c9b106
commit 7ba7161
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/.github/workflows/backend-integration-test.yml b/.github/workflows/backend-integration-test.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         architecture: [linux/amd64]
         java-version: [ 8, 11, 17 ]
-        catalog: [ jdbc-doris, lakehouse-iceberg, hive ]
+        catalog: [ lakehouse-iceberg, hive ]
     env:
       PLATFORM: ${{ matrix.architecture }}
     steps:
@@ -129,7 +129,7 @@ jobs:
     strategy:
       matrix:
         architecture: [linux/amd64]
-        catalog: [ jdbc-mysql, jdbc-postgresql, hadoop, kafka ]
+        catalog: [ jdbc-doris, jdbc-mysql, jdbc-postgresql, hadoop, kafka ]
     env:
       PLATFORM: ${{ matrix.architecture }}
     steps:

diff --git a/.github/workflows/flink-integration-test.yml b/.github/workflows/flink-integration-test.yml
@@ -56,15 +56,14 @@ jobs:
     strategy:
       matrix:
         architecture: [linux/amd64]
-        java-version: [ 8, 11, 17 ]
     env:
       PLATFORM: ${{ matrix.architecture }}
     steps:
       - uses: actions/checkout@v3
 
       - uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java-version }}
+          java-version: '8'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -77,7 +76,7 @@ jobs:
 
       - name: Package Gravitino
         run: |
-          ./gradlew compileDistribution -x test -PjdkVersion=${{ matrix.java-version }}
+          ./gradlew compileDistribution -x test -PjdkVersion=8
 
       - name: Setup debug Github Action
         if: ${{ contains(github.event.pull_request.labels.*.name, 'debug action') }}
@@ -87,15 +86,43 @@ jobs:
         run: |
           dev/ci/util_free_space.sh
 
-      - name: Flink Integration Test
-        id: integrationTest
+      - name: Flink Integration Test Java8
+        id: integrationTestJava8
         run: |
-          ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=${{ matrix.java-version }} :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
-          ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=${{ matrix.java-version }} :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
+          ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=8 :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
+          ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=8 :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
+
+      - uses: actions/setup-java@v4
+        if: ${{ steps.integrationTestJava8.outcome == 'success' }}
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - name: Flink Integration Test Java11
+        if: ${{ steps.integrationTestJava8.outcome == 'success' }}
+        id: integrationTestJava11
+        run: |
+          ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=11 :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
+          ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=11 :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
+
+      - uses: actions/setup-java@v4
+        if: ${{ steps.integrationTestJava11.outcome == 'success' }}
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - name: Flink Integration Test Java17
+        if: ${{ steps.integrationTestJava11.outcome == 'success' }}
+        id: integrationTestJava17
+        run: |
+          ./gradlew -PskipTests -PtestMode=embedded -PjdkVersion=17 :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
+          ./gradlew -PskipTests -PtestMode=deploy -PjdkVersion=17 :flink-connector:test --tests "com.datastrato.gravitino.flink.connector.integration.test.**"
 
       - name: Upload integrate tests reports
         uses: actions/upload-artifact@v3
-        if: ${{ (failure() && steps.integrationTest.outcome == 'failure') || contains(github.event.pull_request.labels.*.name, 'upload log') }}
+        if: ${{ (failure() && steps.integrationTestJava17.outcome == 'failure') || contains(github.event.pull_request.labels.*.name, 'upload log') }}
         with:
           name: flink-connector-integrate-test-reports-${{ matrix.java-version }}
           path: |