[MINOR] improve(CI): Backport #4589 and #4822 to branch-0.6 (#4856)

### What changes were proposed in this pull request? Backport #4589 and #4822 to branch-0.6 ### Why are the changes needed? To align the Github CI to main branch. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing CI. --------- Co-authored-by: mchades <[email protected]>
apache · Sep 5, 2024 · ba14a64 · ba14a64
1 parent cab9eff
commit ba14a64
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/.github/workflows/backend-integration-test.yml b/.github/workflows/backend-integration-test.yml
@@ -51,18 +51,23 @@ jobs:
     outputs:
       source_changes: ${{ steps.filter.outputs.source_changes }}
 
-  # Integration test for AMD64 architecture
-  test-amd64-arch:
+  test-on-push:
     needs: changes
-    if: needs.changes.outputs.source_changes == 'true'
+    if: (github.event_name == 'push' && needs.changes.outputs.source_changes == 'true')
     runs-on: ubuntu-latest
     timeout-minutes: 90
     strategy:
       matrix:
+        # Integration test for AMD64 architecture
         architecture: [linux/amd64]
         java-version: [ 8, 11, 17 ]
         test-mode: [ embedded, deploy ]
-        backend: [ mysql, h2]
+        include:
+          - test-mode: 'embedded'
+            backend: 'h2'
+          - test-mode: 'deploy'
+            backend: 'mysql'
+
     env:
       PLATFORM: ${{ matrix.architecture }}
     steps:
@@ -94,7 +99,7 @@ jobs:
         id: integrationTest
         run: >
           ./gradlew test -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PjdbcBackend=${{ matrix.backend }} -PskipWebITs -PskipDockerTests=false
-          -x :web:test -x :clients:client-python:test -x :flink-connector:test -x :spark-connector:test -x :spark-connector:spark-common:test 
+          -x :web:test -x :clients:client-python:test -x :flink-connector:flink:test -x :spark-connector:test -x :spark-connector:spark-common:test 
           -x :spark-connector:spark-3.3:test -x :spark-connector:spark-3.4:test -x :spark-connector:spark-3.5:test 
           -x :spark-connector:spark-runtime-3.3:test -x :spark-connector:spark-runtime-3.4:test -x :spark-connector:spark-runtime-3.5:test
           -x :authorizations:authorization-ranger:test
@@ -164,7 +169,7 @@ jobs:
         id: integrationTest
         run: >
           ./gradlew test -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} -PjdbcBackend=${{ matrix.backend }} -PskipWebITs -PskipDockerTests=false
-          -x :web:test -x :clients:client-python:test -x :flink-connector:test -x :spark-connector:test -x :spark-connector:spark-common:test 
+          -x :web:test -x :clients:client-python:test -x :flink-connector:flink:test -x :spark-connector:test -x :spark-connector:spark-common:test 
           -x :spark-connector:spark-3.3:test -x :spark-connector:spark-3.4:test -x :spark-connector:spark-3.5:test 
           -x :spark-connector:spark-runtime-3.3:test -x :spark-connector:spark-runtime-3.4:test -x :spark-connector:spark-runtime-3.5:test
           -x :authorizations:authorization-ranger:test