[Improve][CI] Improve oracle schema evolution e2e case (apache#8224)

TongchengOpenSource · Dec 5, 2024 · bf4ecfe · bf4ecfe
1 parent 0e67d9e
commit bf4ecfe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -1293,9 +1293,10 @@ jobs:
       matrix:
         java: [ '8', '11' ]
         os: [ 'ubuntu-latest' ]
-    timeout-minutes: 120
+    timeout-minutes: 150
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
@@ -1305,8 +1306,14 @@ jobs:
       - name: free disk space
         run: tools/github/free_disk_space.sh
       - name: run oracle cdc connector integration test
-        run: |
-          ./mvnw -B -T 1 verify -DskipUT=true -DskipIT=false -D"license.skipAddThirdParty"=true --no-snapshot-updates -pl :connector-cdc-oracle-e2e -am -Pci
+        uses: nick-fields/retry@v3
+        with:
+          timeout_seconds: 9000
+          max_attempts: 3
+          retry_on: error
+          command: |
+            echo 'running oracle cdc connector integration test...' && \
+            ./mvnw -B -T 1 verify -DskipUT=true -DskipIT=false -D"license.skipAddThirdParty"=true -D"skip.ui"=true --no-snapshot-updates -pl :connector-cdc-oracle-e2e -am -Pci
 
   connector-file-local-it:
     needs: [ changes, sanity-check ]

diff --git a/...ava/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/OracleCDCWithSchemaChangeIT.java b/...ava/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/OracleCDCWithSchemaChangeIT.java
@@ -63,6 +63,8 @@
 import java.util.stream.Stream;
 
 import static org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.with;
+import static org.awaitility.Durations.TWO_SECONDS;
 
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -243,7 +245,11 @@ private void assertSchemaEvolution(
                                             sinkSchemaName,
                                             sinkTableName));
             // verify the data
-            await().atMost(300, TimeUnit.SECONDS)
+            with().pollInterval(TWO_SECONDS)
+                    .pollDelay(10, TimeUnit.SECONDS)
+                    .and()
+                    .await()
+                    .atMost(20, TimeUnit.MINUTES)
                     .untilAsserted(
                             () -> {
                                 checkData(

diff --git a/...ansforms-v2/src/main/java/org/apache/seatunnel/transform/rename/FieldRenameTransform.java b/...ansforms-v2/src/main/java/org/apache/seatunnel/transform/rename/FieldRenameTransform.java
@@ -17,6 +17,8 @@
 
 package org.apache.seatunnel.transform.rename;
 
+import org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting;
+
 import org.apache.seatunnel.api.table.catalog.CatalogTable;
 import org.apache.seatunnel.api.table.catalog.Column;
 import org.apache.seatunnel.api.table.catalog.ConstraintKey;
@@ -39,7 +41,6 @@
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.LinkedHashMap;

diff --git a/...ansforms-v2/src/main/java/org/apache/seatunnel/transform/rename/TableRenameTransform.java b/...ansforms-v2/src/main/java/org/apache/seatunnel/transform/rename/TableRenameTransform.java
@@ -17,6 +17,8 @@
 
 package org.apache.seatunnel.transform.rename;
 
+import org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting;
+
 import org.apache.seatunnel.api.table.catalog.CatalogTable;
 import org.apache.seatunnel.api.table.catalog.TableIdentifier;
 import org.apache.seatunnel.api.table.catalog.TablePath;
@@ -35,7 +37,6 @@
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.LinkedHashMap;