Skip to content

[tests] Run E2e tests on Flink 1.20 & Split E2e tests #3514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leonardBang merged 2 commits into from
Aug 8, 2024
Merged

[tests] Run E2e tests on Flink 1.20 & Split E2e tests #3514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
073db95
[tests] Run E2e tests on Flink 1.20
yuxiqian Aug 7, 2024
4bf134d
[hotfix][tests] Separate Pipeline and Source E2e tests
yuxiqian Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/flink_cdc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ env:
flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc,\
flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc"

MODULES_E2E: "\
flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests,\
MODULES_PIPELINE_E2E: "\
flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests"

MODULES_SOURCE_E2E: "\
flink-cdc-e2e-tests/flink-cdc-source-e2e-tests"

jobs:
Expand Down Expand Up @@ -134,7 +136,8 @@ jobs:
"oceanbase",
"db2",
"vitess",
"e2e"
"pipeline_e2e",
"source_e2e"
]
timeout-minutes: 120
env:
Expand Down Expand Up @@ -222,13 +225,17 @@ jobs:
("vitess")
modules=${{ env.MODULES_VITESS }}
;;
("e2e")
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL }},${{ env.MODULES_POSTGRES }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_E2E }}"
modules=${{ env.MODULES_E2E }}
("pipeline_e2e")
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL }},${{ env.MODULES_POSTGRES }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_PIPELINE_E2E }}"
modules=${{ env.MODULES_PIPELINE_E2E }}
;;
("source_e2e")
compile_modules="${{ env.MODULES_CORE }},${{ env.MODULES_PIPELINE_CONNECTORS }},${{ env.MODULES_MYSQL }},${{ env.MODULES_POSTGRES }},${{ env.MODULES_ORACLE }},${{ env.MODULES_MONGODB }},${{ env.MODULES_SQLSERVER }},${{ env.MODULES_TIDB }},${{ env.MODULES_OCEANBASE }},${{ env.MODULES_DB2 }},${{ env.MODULES_VITESS }},${{ env.MODULES_SOURCE_E2E }}"
modules=${{ env.MODULES_SOURCE_E2E }}
;;
esac

if [ ${{ matrix.module }} != "e2e" ]; then
if [ ${{ matrix.module }} != "pipeline_e2e" ] && [ ${{ matrix.module }} != "source_e2e" ]; then
compile_modules=$modules
fi

Expand Down
3 changes: 2 additions & 1 deletion flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ limitations under the License.
<properties>
<flink-1.17>1.17.2</flink-1.17>
<flink-1.18>1.18.1</flink-1.18>
<flink-1.19>1.19.0</flink-1.19>
<flink-1.19>1.19.1</flink-1.19>
<flink-1.20>1.20.0</flink-1.20>
<mysql.driver.version>8.0.27</mysql.driver.version>
<starrocks.connector.version>1.2.9_flink-${flink.major.version}</starrocks.connector.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion ...ests/src/test/java/org/apache/flink/cdc/pipeline/tests/utils/PipelineTestEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public abstract class PipelineTestEnvironment extends TestLogger {

@Parameterized.Parameters(name = "flinkVersion: {0}")
public static List<String> getFlinkVersion() {
return Arrays.asList("1.17.2", "1.18.1", "1.19.0");
return Arrays.asList("1.17.2", "1.18.1", "1.19.1", "1.20.0");
}

@Before
Expand Down
20 changes: 16 additions & 4 deletions flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ limitations under the License.
<flink-1.16>1.16.3</flink-1.16>
<flink-1.17>1.17.2</flink-1.17>
<flink-1.18>1.18.1</flink-1.18>
<flink-1.19>1.19.0</flink-1.19>
<jdbc.version-1.17>3.1.1-1.17</jdbc.version-1.17>
<jdbc.version-1.18>3.1.2-1.18</jdbc.version-1.18>
<jdbc.version-1.19>3.1.2-1.18</jdbc.version-1.19>
<flink-1.19>1.19.1</flink-1.19>
<flink-1.20>1.20.0</flink-1.20>
<jdbc.version-1.17>3.1.2-1.17</jdbc.version-1.17>
<jdbc.version-1.18>3.2.0-1.18</jdbc.version-1.18>
<jdbc.version-1.19>3.2.0-1.19</jdbc.version-1.19>
<jdbc.version-1.20>3.2.0-1.19</jdbc.version-1.20>
<mysql.driver.version>8.0.27</mysql.driver.version>
<postgresql.driver.version>42.7.3</postgresql.driver.version>
</properties>
Expand Down Expand Up @@ -277,6 +279,16 @@ limitations under the License.
</outputDirectory>
</artifactItem>

<artifactItem>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc</artifactId>
<version>${jdbc.version-1.20}</version>
<destFileName>jdbc-connector_${flink-1.20}.jar</destFileName>
<type>jar</type>
<outputDirectory>${project.build.directory}/dependencies
</outputDirectory>
</artifactItem>

<artifactItem>
<groupId>org.apache.flink</groupId>
<artifactId>flink-sql-connector-mysql-cdc</artifactId>
Expand Down
10 changes: 2 additions & 8 deletions .../test/java/org/apache/flink/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,9 @@ public abstract class FlinkContainerTestEnvironment extends TestLogger {

@Parameterized.Parameters(name = "flinkVersion: {0}")
public static List<String> getFlinkVersion() {
return Arrays.asList("1.16.3", "1.17.2", "1.18.1", "1.19.0");
return Arrays.asList("1.16.3", "1.17.2", "1.18.1", "1.19.1", "1.20.0");
}

private static final List<String> FLINK_VERSION_WITH_SCALA_212 =
Arrays.asList("1.16.3", "1.17.2", "1.18.1", "1.19.0");

@Before
public void before() {
mysqlInventoryDatabase.createAndInitialize();
Expand Down Expand Up @@ -309,10 +306,7 @@ private String copyAndGetContainerPath(GenericContainer<?> container, String fil
}

private String getFlinkDockerImageTag() {
if (FLINK_VERSION_WITH_SCALA_212.contains(flinkVersion)) {
return String.format("flink:%s-scala_2.12", flinkVersion);
}
return String.format("flink:%s-scala_2.11", flinkVersion);
return String.format("flink:%s-scala_2.12", flinkVersion);
}

protected String getJdbcConnectorResourceName() {
Expand Down