From 6d36a6eaf7ecbb94619c26536cb43659e91dacb3 Mon Sep 17 00:00:00 2001
From: huzheng <openinx@gmail.com>
Date: Tue, 2 Nov 2021 11:29:35 +0800
Subject: [PATCH 1/2] Flink: Run unit tests for different versions.

---
 flink/v1.12/build.gradle | 10 ++++++++++
 flink/v1.13/build.gradle | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/flink/v1.12/build.gradle b/flink/v1.12/build.gradle
index 46cefa844ca7..fa5dd896fb25 100644
--- a/flink/v1.12/build.gradle
+++ b/flink/v1.12/build.gradle
@@ -41,6 +41,16 @@ project(':iceberg-flink:iceberg-flink-1.12') {
         "src/main/resources"
       ]
     }
+    test {
+      java.srcDirs = [
+        "${project(':iceberg-flink').projectDir}/src/test/java",
+        "src/test/java"
+      ]
+      resources.srcDirs = [
+        "${project(':iceberg-flink').projectDir}/src/test/resources",
+        "src/test/resources"
+      ]
+    }
   }
 
   dependencies {
diff --git a/flink/v1.13/build.gradle b/flink/v1.13/build.gradle
index b2c24d498a06..13db56e4bc3a 100644
--- a/flink/v1.13/build.gradle
+++ b/flink/v1.13/build.gradle
@@ -41,6 +41,16 @@ project(':iceberg-flink:iceberg-flink-1.13') {
           "src/main/resources"
       ]
     }
+    test {
+      java.srcDirs = [
+          "${project(':iceberg-flink').projectDir}/src/test/java",
+          "src/test/java"
+      ]
+      resources.srcDirs = [
+          "${project(':iceberg-flink').projectDir}/src/test/resources",
+          "src/test/resources"
+      ]
+    }
   }
 
   dependencies {

From 0f8c9478a84963eea974cefb5136efb6de2f22c1 Mon Sep 17 00:00:00 2001
From: huzheng <openinx@gmail.com>
Date: Thu, 4 Nov 2021 12:38:17 +0800
Subject: [PATCH 2/2] Remove the iceberg-flink-common tests

---
 .github/workflows/flink-ci.yml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/.github/workflows/flink-ci.yml b/.github/workflows/flink-ci.yml
index 35043c91c2f8..12e7ec883322 100644
--- a/.github/workflows/flink-ci.yml
+++ b/.github/workflows/flink-ci.yml
@@ -49,32 +49,6 @@ on:
     - 'site/**'
 
 jobs:
-  flink-common-tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        jvm: [8, 11]
-    env:
-      SPARK_LOCAL_IP: localhost
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: ${{ matrix.jvm }}
-    - uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
-    - run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
-    - run: ./gradlew -DsparkVersions= -DhiveVersions= :iceberg-flink:check -Pquick=true -x javadoc
-    - uses: actions/upload-artifact@v2
-      if: failure()
-      with:
-        name: test logs
-        path: |
-          **/build/testlogs
-
   flink-tests:
     runs-on: ubuntu-latest
     strategy: