This is an automated email from the ASF dual-hosted git repository. kunni pushed a commit to branch FLINK-38729-2 in repository https://gitbox.apache.org/repos/asf/flink-cdc.git
commit 3240e50fa53e4d9be66a4366f6f480cd3d9c5227 Author: lvyanquan <[email protected]> AuthorDate: Thu Mar 12 10:41:13 2026 +0800 Address comment. --- .../flink-cdc-pipeline-e2e-tests/pom.xml | 39 ---------------------- .../flink/cdc/pipeline/tests/FlussE2eITCase.java | 2 ++ .../cdc/pipeline/tests/MaxComputeE2eITCase.java | 2 ++ .../cdc/pipeline/tests/MySqlToDorisE2eITCase.java | 2 ++ .../cdc/pipeline/tests/MySqlToHudiE2eITCase.java | 2 ++ .../pipeline/tests/MySqlToIcebergE2eITCase.java | 2 ++ .../cdc/pipeline/tests/MySqlToPaimonE2eITCase.java | 2 ++ .../flink/cdc/pipeline/tests/MysqlE2eITCase.java | 2 ++ .../tests/MysqlE2eWithYarnApplicationITCase.java | 2 ++ .../cdc/pipeline/tests/MysqlToKafkaE2eITCase.java | 2 ++ .../cdc/pipeline/tests/OceanBaseE2eITCase.java | 2 ++ .../flink/cdc/pipeline/tests/OracleE2eITCase.java | 2 ++ .../cdc/pipeline/tests/PostgresE2eITCase.java | 2 ++ .../flink/cdc/pipeline/tests/RouteE2eITCase.java | 2 ++ .../cdc/pipeline/tests/SchemaEvolveE2eITCase.java | 2 ++ .../tests/SchemaEvolvingTransformE2eITCase.java | 2 ++ .../cdc/pipeline/tests/TransformE2eITCase.java | 2 ++ .../flink/cdc/pipeline/tests/UdfE2eITCase.java | 2 ++ .../migration/MySqlToPaimonMigrationITCase.java | 2 ++ .../tests/migration/YamlJobMigrationITCase.java | 2 ++ .../tests/specs/FlinkPipelineSpecsITCase.java | 2 ++ 21 files changed, 40 insertions(+), 39 deletions(-) diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml index 897d1acc3..8c263f8de 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml @@ -805,43 +805,4 @@ limitations under the License. </plugin> </plugins> </build> - - <profiles> - <profile> - <id>flink2</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>default-test</id> - <phase>none</phase> - </execution> - <execution> - <id>integration-tests</id> - <phase>none</phase> - </execution> - <execution> - <id>end-to-end-tests</id> - <configuration> - <includes> - <include>**/ValuesE2eITCase.java</include> - </includes> - <excludes> - <exclude>**/MysqlE2eWithYarnApplicationITCase.java</exclude> - </excludes> - </configuration> - </execution> - <execution> - <id>run-last-test</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/FlussE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/FlussE2eITCase.java index 8f12e20c1..05b34dab4 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/FlussE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/FlussE2eITCase.java @@ -26,6 +26,7 @@ import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; @@ -48,6 +49,7 @@ import java.util.List; import java.util.stream.Collectors; /** An End-to-end test case for Fluss pipeline connector. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") @Testcontainers public class FlussE2eITCase extends PipelineTestEnvironment { diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MaxComputeE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MaxComputeE2eITCase.java index 59d966bc2..f8ae049f5 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MaxComputeE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MaxComputeE2eITCase.java @@ -34,6 +34,7 @@ import com.aliyun.odps.task.SQLTask; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; @@ -56,6 +57,7 @@ import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; /** End-to-end tests for maxcompute cdc pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class MaxComputeE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MaxComputeE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToDorisE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToDorisE2eITCase.java index 434ccbcf6..351e3ccea 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToDorisE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToDorisE2eITCase.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; @@ -49,6 +50,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** End-to-end tests for mysql cdc to Doris pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class MySqlToDorisE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MySqlToDorisE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToHudiE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToHudiE2eITCase.java index 76936b698..d1838041d 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToHudiE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToHudiE2eITCase.java @@ -35,6 +35,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.BindMode; @@ -64,6 +65,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** End-to-end tests for mysql cdc to Iceberg pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") public class MySqlToHudiE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MySqlToHudiE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToIcebergE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToIcebergE2eITCase.java index c63c54ad6..6614d448a 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToIcebergE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToIcebergE2eITCase.java @@ -38,6 +38,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,6 +71,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** End-to-end tests for mysql cdc to Iceberg pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") public class MySqlToIcebergE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MySqlToIcebergE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToPaimonE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToPaimonE2eITCase.java index d263dfd53..f0e7cb082 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToPaimonE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MySqlToPaimonE2eITCase.java @@ -26,6 +26,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.Container; @@ -48,6 +49,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** End-to-end tests for mysql cdc to Paimon pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class MySqlToPaimonE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MySqlToPaimonE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eITCase.java index b85d77ebc..372b9f7dd 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eITCase.java @@ -24,6 +24,7 @@ import org.apache.flink.cdc.pipeline.tests.utils.PipelineTestEnvironment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +37,7 @@ import java.time.Duration; import java.util.function.Function; /** End-to-end tests for mysql cdc pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class MysqlE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MysqlE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eWithYarnApplicationITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eWithYarnApplicationITCase.java index cab98c6af..7de50469b 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eWithYarnApplicationITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlE2eWithYarnApplicationITCase.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.Network; @@ -50,6 +51,7 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; /** End-to-end tests for mysql cdc pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") public class MysqlE2eWithYarnApplicationITCase extends PipelineTestOnYarnEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MysqlE2eWithYarnApplicationITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlToKafkaE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlToKafkaE2eITCase.java index a8093f0f7..5090d56f4 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlToKafkaE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/MysqlToKafkaE2eITCase.java @@ -38,6 +38,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.KafkaContainer; @@ -71,6 +72,7 @@ import static org.apache.flink.util.DockerImageVersions.KAFKA; import static org.assertj.core.api.Assertions.assertThat; /** End-to-end tests for mysql cdc to Kafka pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class MysqlToKafkaE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MysqlToKafkaE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OceanBaseE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OceanBaseE2eITCase.java index 2bebedb3b..7bbf61378 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OceanBaseE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OceanBaseE2eITCase.java @@ -29,6 +29,7 @@ import org.apache.commons.text.StringEscapeUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.output.Slf4jLogConsumer; @@ -51,6 +52,7 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; /** OceanBase flink cdc pipeline connector sink integrate test. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class OceanBaseE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(OceanBaseE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OracleE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OracleE2eITCase.java index 0be4734e7..f474815e4 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OracleE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/OracleE2eITCase.java @@ -27,6 +27,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.DockerClientFactory; @@ -61,6 +62,7 @@ import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.TOP_USER; /** End-to-end tests for Oracle cdc pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") public class OracleE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(OracleE2eITCase.class); protected static final Pattern COMMENT_PATTERN = Pattern.compile("^(.*)--.*$"); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/PostgresE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/PostgresE2eITCase.java index e4b33b3ff..69a65682f 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/PostgresE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/PostgresE2eITCase.java @@ -24,6 +24,7 @@ import org.apache.flink.cdc.pipeline.tests.utils.PipelineTestEnvironment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.PostgreSQLContainer; @@ -42,6 +43,7 @@ import static org.apache.flink.cdc.connectors.postgres.PostgresTestBase.getJdbcC import static org.apache.flink.cdc.connectors.postgres.PostgresTestBase.getSlotName; /** End-to-end tests for postgres cdc pipeline job. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") public class PostgresE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(PostgresE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/RouteE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/RouteE2eITCase.java index 2514711c0..c9169388d 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/RouteE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/RouteE2eITCase.java @@ -23,6 +23,7 @@ import org.apache.flink.cdc.pipeline.tests.utils.PipelineTestEnvironment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; @@ -37,6 +38,7 @@ import java.util.function.Function; import java.util.stream.IntStream; /** E2e tests for routing features. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class RouteE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(RouteE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolveE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolveE2eITCase.java index a6ade384c..7595dd6d1 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolveE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolveE2eITCase.java @@ -24,6 +24,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +37,7 @@ import java.util.Collections; import java.util.List; /** E2e tests for Schema Evolution cases. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class SchemaEvolveE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(SchemaEvolveE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolvingTransformE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolvingTransformE2eITCase.java index 130dba0c4..5410eb903 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolvingTransformE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/SchemaEvolvingTransformE2eITCase.java @@ -24,6 +24,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +37,7 @@ import java.util.Collections; import java.util.List; /** E2e tests for Schema Evolution cases. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class SchemaEvolvingTransformE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(SchemaEvolvingTransformE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/TransformE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/TransformE2eITCase.java index 351bd76fd..925bc6059 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/TransformE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/TransformE2eITCase.java @@ -27,6 +27,7 @@ import org.apache.flink.cdc.runtime.operators.transform.PreTransformOperator; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; @@ -51,6 +52,7 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; /** E2e tests for the {@link PreTransformOperator} and {@link PostTransformOperator}. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class TransformE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(TransformE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/UdfE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/UdfE2eITCase.java index ca8e3d764..c55a67c76 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/UdfE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/UdfE2eITCase.java @@ -23,6 +23,7 @@ import org.apache.flink.cdc.pipeline.tests.utils.PipelineTestEnvironment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -39,6 +40,7 @@ import java.util.function.Function; import java.util.stream.Stream; /** E2e tests for User-defined functions. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class UdfE2eITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(TransformE2eITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/MySqlToPaimonMigrationITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/MySqlToPaimonMigrationITCase.java index bcedcf7b0..bcfac098f 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/MySqlToPaimonMigrationITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/MySqlToPaimonMigrationITCase.java @@ -28,6 +28,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.slf4j.Logger; @@ -52,6 +53,7 @@ import java.util.stream.Collectors; /** * E2e cases for stopping & restarting jobs of `MySQL source to Paimon sink` from previous state. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class MySqlToPaimonMigrationITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(MySqlToPaimonMigrationITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/YamlJobMigrationITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/YamlJobMigrationITCase.java index bdf970ea6..ef2112935 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/YamlJobMigrationITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/migration/YamlJobMigrationITCase.java @@ -29,6 +29,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.slf4j.Logger; @@ -43,6 +44,7 @@ import java.time.Duration; import java.util.function.Function; /** E2e cases for stopping & restarting jobs from previous state. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") class YamlJobMigrationITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(YamlJobMigrationITCase.class); diff --git a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/specs/FlinkPipelineSpecsITCase.java b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/specs/FlinkPipelineSpecsITCase.java index b7ac0507c..0d5515cb3 100644 --- a/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/specs/FlinkPipelineSpecsITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/specs/FlinkPipelineSpecsITCase.java @@ -23,6 +23,7 @@ import org.apache.flink.cdc.pipeline.tests.utils.PipelineTestEnvironment; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -50,6 +51,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** YAML-spec based pipeline test cases. */ +@EnabledIfSystemProperty(named = "specifiedFlinkVersion", matches = "^1.*") public class FlinkPipelineSpecsITCase extends PipelineTestEnvironment { private static final Logger LOG = LoggerFactory.getLogger(FlinkPipelineSpecsITCase.class);
