From bbac948c87e6728e0851e4c1f628f677f2c177f4 Mon Sep 17 00:00:00 2001
From: gongzhongqiang <764629910@qq.com>
Date: Wed, 20 Sep 2023 09:38:20 +0800
Subject: [PATCH] revert ci

---
 .../cdc/connectors/tests/OracleE2eITCase.java |  4 +---
 tools/azure-pipelines/jobs-template.yml       | 10 ++++------
 tools/ci/stage.sh                             | 19 +++++--------------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/flink-cdc-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java b/flink-cdc-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java
index 20c36627747..e7a53396e77 100644
--- a/flink-cdc-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java
+++ b/flink-cdc-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java
@@ -54,8 +54,6 @@ public class OracleE2eITCase extends FlinkContainerTestEnvironment {
 
     private static final Path oracleCdcJar = TestUtils.getResource("oracle-cdc-connector.jar");
     private static final Path mysqlDriverJar = TestUtils.getResource("mysql-driver.jar");
-    private static final DockerImageName oracleImageName =
-            DockerImageName.parse("goodboy008/oracle-19.3.0-ee").withTag("non-cdb");
     private static OracleContainer oracle;
 
     @Before
@@ -85,7 +83,7 @@ public static void afterClass() {
         // Cleanup the oracle image, because it's too large and will cause the next test to fail.
         oracle.getDockerClient()
                 .listImagesCmd()
-                .withImageNameFilter(oracleImageName.getUnversionedPart())
+                .withImageNameFilter(ORACLE_IMAGE)
                 .exec()
                 .forEach(image -> oracle.getDockerClient().removeImageCmd(image.getId()).exec());
     }
diff --git a/tools/azure-pipelines/jobs-template.yml b/tools/azure-pipelines/jobs-template.yml
index eb23923a803..428c0c66927 100644
--- a/tools/azure-pipelines/jobs-template.yml
+++ b/tools/azure-pipelines/jobs-template.yml
@@ -80,14 +80,14 @@ jobs:
           module: mongodb
         sqlserver:
           module: sqlserver
+        tidb:
+          module: tidb
         db2:
           module: db2
         vitess:
           module: vitess
         misc:
           module: misc
-        e2e_1:
-          module: e2e_1
     steps:
       # download artifact from compile stage
       - task: DownloadPipelineArtifact@2
@@ -146,10 +146,8 @@ jobs:
           module: mysql
         oceanbase:
           module: oceanbase
-        tidb:
-          module: tidb
-        e2e_2:
-          module: e2e_2
+        e2e:
+          module: e2e
     steps:
       # download artifact from compile stage
       - task: DownloadPipelineArtifact@2
diff --git a/tools/ci/stage.sh b/tools/ci/stage.sh
index 98580d30f04..497b34d21e3 100755
--- a/tools/ci/stage.sh
+++ b/tools/ci/stage.sh
@@ -23,8 +23,7 @@ STAGE_TIDB="tidb"
 STAGE_OCEANBASE="oceanbase"
 STAGE_DB2="db2"
 STAGE_VITESS="vitess"
-STAGE_E2E_1="e2e_1"
-STAGE_E2E_2="e2e_2"
+STAGE_E2E="e2e"
 STAGE_MISC="misc"
 
 MODULES_MYSQL="\
@@ -97,12 +96,7 @@ function get_compile_modules_for_stage() {
         (${STAGE_VITESS})
             echo "-pl $MODULES_VITESS -am"
         ;;
-        (${STAGE_E2E_1})
-            # compile everything; using the -am switch does not work with negated module lists!
-            # the negation takes precedence, thus not all required modules would be built
-            echo ""
-        ;;
-        (${STAGE_E2E_2})
+        (${STAGE_E2E})
             # compile everything; using the -am switch does not work with negated module lists!
             # the negation takes precedence, thus not all required modules would be built
             echo ""
@@ -136,7 +130,7 @@ function get_test_modules_for_stage() {
     local negated_tidb=\!${MODULES_TIDB//,/,\!}
     local negated_oceanbase=\!${MODULES_OCEANBASE//,/,\!}
     local negated_db2=\!${MODULES_DB2//,/,\!}
-    local negated_vitess=\!${MODULES_VITESS//,/,\!}
+    local negated_vitess=\!${MODULES_vitess//,/,\!}
     local negated_e2e=\!${MODULES_E2E//,/,\!}
     local modules_misc="$negated_mysql,$negated_postgres,$negated_oracle,$negated_mongodb,$negated_sqlserver,$negated_tidb,$negated_oceanbase,$negated_db2,$negated_vitess,$negated_e2e"
 
@@ -168,11 +162,8 @@ function get_test_modules_for_stage() {
         (${STAGE_VITESS})
             echo "-pl $modules_vitess"
         ;;
-        (${STAGE_E2E_1})
-            echo "-pl $modules_e2e -Dtest=Db2E2eITCase,MongoE2eITCase,OracleE2eITCase,PostgresE2eITCase,SqlServerE2eITCas,VitessE2eITCase"
-        ;;
-        (${STAGE_E2E_2})
-            echo "-pl $modules_e2e -Dtest=MySqlE2eITCase,TiDBE2eITCase"
+        (${STAGE_E2E})
+            echo "-pl $modules_e2e"
         ;;
         (${STAGE_MISC})
             echo "-pl $modules_misc"