github-forks
/
flink-cdc-connectors
mirror of https://github.com/ververica/flink-cdc-connectors.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build][e2e] Separate Pipeline and Source E2e tests and cover flink 1.20 version

Browse Source 
This closes #3514.
pull/3444/head
yuxiqian 6 months ago committed by GitHub
parent 9d6154f123
commit af02ce1bc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File

21
.github/workflows/flink_cdc.yml vendored
Unescape Escape View File

@ -94,8 +94,10 @@ env:
flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc,\ flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc,\
flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc" flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc"
MODULES_E2E: "\ MODULES_PIPELINE_E2E: "\
flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests,\ flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests"
MODULES_SOURCE_E2E: "\
flink-cdc-e2e-tests/flink-cdc-source-e2e-tests" flink-cdc-e2e-tests/flink-cdc-source-e2e-tests"
jobs: jobs:
@ -134,7 +136,8 @@ jobs:
"oceanbase", "oceanbase",
"db2", "db2",
"vitess", "vitess",
"e2e" "pipeline_e2e",
"source_e2e"
] ]
timeout-minutes: 120 timeout-minutes: 120
env: env:
@ -222,13 +225,17 @@ jobs:
("vitess") ("vitess")
modules=${{ env.MODULES_VITESS }} modules=${{ env.MODULES_VITESS }}
;; ;;
("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_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_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 esac
if [ ${{ matrix.module }} != "e2e" ]; then if [ ${{ matrix.module }} != "pipeline_e2e" ] && [ ${{ matrix.module }} != "source_e2e" ]; then
compile_modules=$modules compile_modules=$modules
fi fi

3
flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml
Unescape Escape View File

@ -30,7 +30,8 @@ limitations under the License.
<properties> <properties>
<flink-1.17>1.17.2</flink-1.17> <flink-1.17>1.17.2</flink-1.17>
<flink-1.18>1.18.1</flink-1.18> <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> <mysql.driver.version>8.0.27</mysql.driver.version>
<starrocks.connector.version>1.2.9_flink-${flink.major.version}</starrocks.connector.version> <starrocks.connector.version>1.2.9_flink-${flink.major.version}</starrocks.connector.version>
</properties> </properties>

2
flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/src/test/java/org/apache/flink/cdc/pipeline/tests/utils/PipelineTestEnvironment.java
Unescape Escape View File

@ -88,7 +88,7 @@ public abstract class PipelineTestEnvironment extends TestLogger {
@Parameterized.Parameters(name = "flinkVersion: {0}") @Parameterized.Parameters(name = "flinkVersion: {0}")
public static List<String> getFlinkVersion() { 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 @Before

20
flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/pom.xml
Unescape Escape View File

@ -31,10 +31,12 @@ limitations under the License.
<flink-1.16>1.16.3</flink-1.16> <flink-1.16>1.16.3</flink-1.16>
<flink-1.17>1.17.2</flink-1.17> <flink-1.17>1.17.2</flink-1.17>
<flink-1.18>1.18.1</flink-1.18> <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>
<jdbc.version-1.17>3.1.1-1.17</jdbc.version-1.17> <flink-1.20>1.20.0</flink-1.20>
<jdbc.version-1.18>3.1.2-1.18</jdbc.version-1.18> <jdbc.version-1.17>3.1.2-1.17</jdbc.version-1.17>
<jdbc.version-1.19>3.1.2-1.18</jdbc.version-1.19> <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> <mysql.driver.version>8.0.27</mysql.driver.version>
<postgresql.driver.version>42.7.3</postgresql.driver.version> <postgresql.driver.version>42.7.3</postgresql.driver.version>
</properties> </properties>
@ -277,6 +279,16 @@ limitations under the License.
</outputDirectory> </outputDirectory>
</artifactItem> </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> <artifactItem>
<groupId>org.apache.flink</groupId> <groupId>org.apache.flink</groupId>
<artifactId>flink-sql-connector-mysql-cdc</artifactId> <artifactId>flink-sql-connector-mysql-cdc</artifactId>

10
flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java
Unescape Escape View File

@ -120,12 +120,9 @@ public abstract class FlinkContainerTestEnvironment extends TestLogger {
@Parameterized.Parameters(name = "flinkVersion: {0}") @Parameterized.Parameters(name = "flinkVersion: {0}")
public static List<String> getFlinkVersion() { 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 @Before
public void before() { public void before() {
mysqlInventoryDatabase.createAndInitialize(); mysqlInventoryDatabase.createAndInitialize();
@ -309,10 +306,7 @@ public abstract class FlinkContainerTestEnvironment extends TestLogger {
} }
private String getFlinkDockerImageTag() { 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.12", flinkVersion);
}
return String.format("flink:%s-scala_2.11", flinkVersion);
} }
protected String getJdbcConnectorResourceName() { protected String getJdbcConnectorResourceName() {

Write Preview
Loading…
Cancel
Save