Skip to content

Commit 3ac0e1a

Browse files
committed
Add support for Flink 2.x.
1 parent 7da405e commit 3ac0e1a

5 files changed

Lines changed: 49 additions & 6 deletions

File tree

.github/workflows/flink_cdc_ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ jobs:
6363
with:
6464
java-versions: "[11]"
6565
modules: "['core']"
66+
common_2_x:
67+
name: Common Unit Tests 2.x
68+
uses: ./.github/workflows/flink_cdc_base.yml
69+
with:
70+
java-versions: "[11]"
71+
flink-versions: "['2.2.0']"
72+
custom-maven-parameter: "-Pflink2"
73+
modules: "['core_2.x']"
6674
pipeline-ut:
6775
name: Pipeline Unit Tests
6876
uses: ./.github/workflows/flink_cdc_base.yml
@@ -99,6 +107,7 @@ jobs:
99107
with:
100108
java-versions: "[11]"
101109
flink-versions: "['2.2.0']"
110+
custom-maven-parameter: "-Pflink2"
102111
modules: "['pipeline_e2e_2.x']"
103112
parallelism: ${{ matrix.parallelism }}
104113
source_e2e:
@@ -108,3 +117,12 @@ jobs:
108117
java-versions: "[11]"
109118
flink-versions: "['1.19.3', '1.20.3']"
110119
modules: "['source_e2e']"
120+
modules: "['core_2.x']"
121+
common_2_x:
122+
name: Common Unit Tests 2.x
123+
uses: ./.github/workflows/flink_cdc_base.yml
124+
with:
125+
java-versions: "[11]"
126+
flink-versions: "['2.2.0']"
127+
custom-maven-parameter: "-Pflink2"
128+
modules: "['core_2.x']"

.github/workflows/flink_cdc_ci_nightly.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ jobs:
5454
with:
5555
java-versions: "[17]"
5656
modules: "['core']"
57+
common_2_x:
58+
if: github.repository == 'apache/flink-cdc'
59+
name: Common Unit Tests 2.x
60+
uses: ./.github/workflows/flink_cdc_base.yml
61+
with:
62+
java-versions: "[17]"
63+
flink-versions: "['2.2.0']"
64+
custom-maven-parameter: "-Pflink2"
65+
modules: "['core_2.x']"
5766
pipeline-ut:
5867
if: github.repository == 'apache/flink-cdc'
5968
name: Pipeline Unit Tests
@@ -93,6 +102,7 @@ jobs:
93102
uses: ./.github/workflows/flink_cdc_base.yml
94103
with:
95104
java-versions: "[17]"
105+
custom-maven-parameter: "-Pflink2"
96106
flink-versions: "['2.2.0']"
97107
modules: "['pipeline_e2e_2.x']"
98108
parallelism: ${{ matrix.parallelism }}

.github/workflows/modules.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
"flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values"
1818
]
1919

20+
MODULES_CORE_2_X = [
21+
"flink-cdc-cli",
22+
"flink-cdc-common",
23+
"flink-cdc-composer",
24+
"flink-cdc-runtime",
25+
"flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values",
26+
"flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values-2.x"
27+
]
28+
2029
MODULES_PIPELINE_CONNECTORS = [
2130
"flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris",
2231
"flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch",
@@ -146,6 +155,7 @@
146155

147156
ALL_MODULES = set(
148157
MODULES_CORE +
158+
MODULES_CORE_2_X +
149159
MODULES_PIPELINE_CONNECTORS +
150160
MODULES_MYSQL_SOURCE +
151161
MODULES_MYSQL_PIPELINE +

flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests-2.x/src/test/java/org/apache/flink/cdc/pipeline/tests/utils/TarballFetcher.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,11 @@ private static void fetchInternal(GenericContainer<?> container, CdcVersion vers
6060

6161
container.copyFileToContainer(
6262
MountableFile.forHostPath(
63-
TestUtils.getResource(
64-
"flink-cdc.sh", ".", "flink-cdc-dist-2.x", "src")),
63+
TestUtils.getResource("flink-cdc.sh", "flink-cdc-dist", "src"), 0755),
6564
version.workDir() + "/bin/flink-cdc.sh");
66-
container.execInContainer("chmod", "+x", version.workDir() + "/bin/flink-cdc.sh");
6765
container.copyFileToContainer(
6866
MountableFile.forHostPath(
69-
TestUtils.getResource(
70-
"flink-cdc.yaml", ".", "flink-cdc-dist-2.x", "src")),
67+
TestUtils.getResource("flink-cdc.yaml", "flink-cdc-dist", "src"), 0755),
7168
version.workDir() + "/conf/flink-cdc.yaml");
7269
container.copyFileToContainer(
7370
MountableFile.forHostPath(TestUtils.getResource("flink-cdc-dist.jar")),

flink-cdc-e2e-tests/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,17 @@ limitations under the License.
3333
<module>flink-cdc-e2e-utils</module>
3434
<module>flink-cdc-source-e2e-tests</module>
3535
<module>flink-cdc-pipeline-e2e-tests</module>
36-
<module>flink-cdc-pipeline-e2e-tests-2.x</module>
3736
</modules>
3837

38+
<profiles>
39+
<profile>
40+
<id>flink2</id>
41+
<modules>
42+
<module>flink-cdc-pipeline-e2e-tests-2.x</module>
43+
</modules>
44+
</profile>
45+
</profiles>
46+
3947
<build>
4048
<plugins>
4149
<plugin>

0 commit comments

Comments
 (0)