diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-assert-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-assert-flink-e2e/pom.xml index 37de9280a0a..7db3cb830bb 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-assert-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-assert-flink-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-assert diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-datahub-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-datahub-flink-e2e/pom.xml index 2adf5557e45..79dc07e22a4 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-datahub-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-datahub-flink-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-datahub diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-fake-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-fake-flink-e2e/pom.xml index 299c2dddc4c..ffb3d91b22d 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-fake-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-fake-flink-e2e/pom.xml @@ -34,12 +34,20 @@ test-jar test + + org.apache.seatunnel connector-fake ${project.version} test + + org.apache.seatunnel + connector-console + ${project.version} + test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-file-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-file-flink-e2e/pom.xml index 70e91ec79ce..df018a71c52 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-file-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-file-flink-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-file-local diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/pom.xml index 30c1ae671d9..975febb372a 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-iotdb diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml index 4b4d1d9981e..eb9ed148f86 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml @@ -34,12 +34,28 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + + + org.apache.seatunnel + connector-console + ${project.version} + test + org.apache.seatunnel connector-jdbc ${project.version} test + + org.testcontainers postgresql diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-mongodb-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-mongodb-flink-e2e/pom.xml index a49496c68f4..b7c2ef0a621 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-mongodb-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-mongodb-flink-e2e/pom.xml @@ -35,11 +35,19 @@ test-jar test + + org.apache.seatunnel connector-mongodb ${project.version} test + + org.apache.seatunnel + connector-console + ${project.version} + test + diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/pom.xml index a1b314bd1bb..d92a1b3b55b 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/pom.xml @@ -34,12 +34,20 @@ test-jar test + + org.apache.seatunnel connector-redis ${project.version} test + + org.apache.seatunnel + connector-assert + ${project.version} + test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml index 045579f3701..61d7911a548 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml @@ -45,18 +45,6 @@ ${project.version} test - - org.apache.seatunnel - seatunnel-connectors-v2-dist - ${project.version} - test - - - * - * - - - org.awaitility awaitility diff --git a/seatunnel-e2e/seatunnel-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/pom.xml index 2ca2e18613a..fd6116d2faa 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-e2e/pom.xml @@ -42,18 +42,6 @@ ${project.version} test - - org.apache.seatunnel - seatunnel-connectors-flink-dist - ${project.version} - test - - - * - * - - - \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-assert-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-assert-e2e/pom.xml index fd262b6f3e1..358771f045b 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-assert-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-assert-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + seatunnel-connector-flink-fake + ${project.version} + test + org.apache.seatunnel seatunnel-connector-flink-assert diff --git a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-clickhouse-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-clickhouse-e2e/pom.xml index 87ef96e073d..cfa0378627c 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-clickhouse-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-clickhouse-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + seatunnel-connector-flink-fake + ${project.version} + test + org.apache.seatunnel seatunnel-connector-flink-clickhouse diff --git a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java index a1ec702690e..ab62a623d01 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java +++ b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java @@ -38,7 +38,7 @@ protected String getStartShellName() { @Override protected String getConnectorType() { - return "seatunnel"; + return "flink"; } @Override diff --git a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-fake-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-fake-e2e/pom.xml index 873d6c65f9b..1d406819675 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-fake-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-fake-e2e/pom.xml @@ -34,12 +34,20 @@ test-jar test + + org.apache.seatunnel seatunnel-connector-flink-fake ${project.version} test + + org.apache.seatunnel + seatunnel-connector-flink-console + ${project.version} + test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-file-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-file-e2e/pom.xml index 1bc0ebca3e1..fd39c309247 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-file-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-file-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + seatunnel-connector-flink-fake + ${project.version} + test + org.apache.seatunnel seatunnel-connector-flink-file diff --git a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-http-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-http-e2e/pom.xml index 000b29c2c44..c4ff4e7cfbf 100644 --- a/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-http-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-e2e/seatunnel-connector-flink-http-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + seatunnel-connector-flink-console + ${project.version} + test + org.apache.seatunnel seatunnel-connector-flink-http diff --git a/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml index ffd5e49192d..02795a7d26d 100644 --- a/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml @@ -38,17 +38,5 @@ ${project.version} test - - org.apache.seatunnel - seatunnel-connectors-flink-sql-dist - ${project.version} - test - - - * - * - - - \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/sql/FlinkContainer.java b/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/sql/FlinkContainer.java index 82a7159c17c..e195b4aa9c2 100644 --- a/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/sql/FlinkContainer.java +++ b/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-e2e-base/src/test/java/org/apache/seatunnel/e2e/flink/sql/FlinkContainer.java @@ -17,8 +17,14 @@ package org.apache.seatunnel.e2e.flink.sql; +import static org.apache.seatunnel.e2e.common.ContainerUtil.copyConfigFileToContainer; + import org.apache.seatunnel.e2e.common.AbstractFlinkContainer; +import org.testcontainers.containers.Container; + +import java.io.IOException; + /** * This class is the base class of FlinkEnvironment test. * The before method will create a Flink cluster, and after method will close the Flink cluster. @@ -50,4 +56,9 @@ protected String getConnectorModulePath() { protected String getConnectorNamePrefix() { return "flink-sql-connector-"; } + + public Container.ExecResult executeSeaTunnelFlinkJob(String confFile) throws IOException, InterruptedException { + final String confInContainerPath = copyConfigFileToContainer(jobManager, confFile); + return executeCommand(jobManager, confInContainerPath); + } } diff --git a/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-fake-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-fake-e2e/pom.xml index 9eda3de27cf..24b8b010da8 100644 --- a/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-fake-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-sql-e2e/setunnel-connector-flink-sql-fake-e2e/pom.xml @@ -34,6 +34,7 @@ test-jar test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-datahub-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-datahub-spark-e2e/pom.xml index eb5d46f6993..79c3916e787 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-datahub-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-datahub-spark-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-datahub diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-fake-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-fake-spark-e2e/pom.xml index 8f2b4e6f133..1f9e6d844fe 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-fake-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-fake-spark-e2e/pom.xml @@ -34,12 +34,20 @@ test-jar test + + org.apache.seatunnel connector-fake ${project.version} test + + org.apache.seatunnel + connector-console + ${project.version} + test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-file-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-file-spark-e2e/pom.xml index 7a310d19c93..0ab6f3efd72 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-file-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-file-spark-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-file-local diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/pom.xml index 171f5a27a69..2c4e8e4e547 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-fake + ${project.version} + test + org.apache.seatunnel connector-iotdb diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml index a5242ef72c4..bd0a341fea9 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml @@ -34,12 +34,16 @@ test-jar test + + org.apache.seatunnel connector-jdbc ${project.version} test + + mysql mysql-connector-java diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/pom.xml index b5538ed1be7..25212814ad8 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/pom.xml @@ -34,6 +34,14 @@ test-jar test + + + + org.apache.seatunnel + connector-assert + ${project.version} + test + org.apache.seatunnel connector-redis diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml index b5aef0ec786..898bf04c930 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml @@ -43,18 +43,6 @@ ${project.version} test - - org.apache.seatunnel - seatunnel-connectors-v2-dist - ${project.version} - test - - - * - * - - - org.awaitility diff --git a/seatunnel-e2e/seatunnel-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-e2e/pom.xml index 5a80812f232..86c903a84a3 100644 --- a/seatunnel-e2e/seatunnel-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-e2e/pom.xml @@ -40,18 +40,6 @@ ${project.version} test - - org.apache.seatunnel - seatunnel-connectors-spark-dist - ${project.version} - test - - - * - * - - - \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-fake-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-fake-e2e/pom.xml index 4dabac2fb81..562db71d605 100644 --- a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-fake-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-fake-e2e/pom.xml @@ -34,12 +34,20 @@ test-jar test + + org.apache.seatunnel seatunnel-connector-spark-fake ${project.version} test + + org.apache.seatunnel + seatunnel-connector-spark-console + ${project.version} + test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-http-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-http-e2e/pom.xml index d859d86eed3..98a7191c712 100644 --- a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-http-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-http-e2e/pom.xml @@ -40,6 +40,12 @@ ${project.version} test + + org.apache.seatunnel + seatunnel-connector-spark-console + ${project.version} + test + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml index 6e1b2aec5f9..b0669c9a0ee 100644 --- a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml @@ -34,6 +34,20 @@ test-jar test + + + + org.apache.seatunnel + seatunnel-connector-spark-fake + ${project.version} + test + + + org.apache.seatunnel + seatunnel-connector-spark-console + ${project.version} + test + org.apache.seatunnel seatunnel-connector-spark-jdbc