From 88818685d195d9ab91b6c4ff31e91d00bc7858c9 Mon Sep 17 00:00:00 2001 From: Etienne Chauchot Date: Fri, 1 Mar 2024 15:17:35 +0100 Subject: [PATCH] [FLINK-32353] Build on Flink 1.18.0 and refreeze archunit violations store. Test connector on 1.17.2 and 1.18.0. Skip archunit tests on 1.17.2 --- .github/workflows/push_pr.yml | 15 ++++-- .github/workflows/weekly.yml | 49 +++++++++++-------- .../7c16ca6f-4479-46d5-80cf-4f766ee5b442 | 0 .../dc1ba6f4-3d84-498c-a085-e02ba5936201 | 8 +-- flink-connector-cassandra/pom.xml | 14 +++--- pom.xml | 4 +- tools/releasing/shared | 1 - 7 files changed, 50 insertions(+), 41 deletions(-) create mode 100644 flink-connector-cassandra/archunit-violations/7c16ca6f-4479-46d5-80cf-4f766ee5b442 delete mode 160000 tools/releasing/shared diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml index 834edf1e..c797bc39 100644 --- a/.github/workflows/push_pr.yml +++ b/.github/workflows/push_pr.yml @@ -22,10 +22,15 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - compile_and_test: - strategy: - matrix: - flink: [1.16.2, 1.17.1] + # tests that current PR does not break compatibility with last 2 minor released versions of Flink + non-main-version: uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: - flink_version: ${{ matrix.flink }} + flink_version: 1.17.2 + skip_archunit_tests: true + main-version: + uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils + with: + flink_version: 1.18.0 + + diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 7b37926f..390906fd 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -22,27 +22,36 @@ on: - cron: "0 0 * * 0" workflow_dispatch: jobs: - compile_and_test: + # tests that current connector iteration does not break compatibility with last 2 minor released Flink versions + non-main-version: if: github.repository_owner == 'apache' - strategy: - matrix: - # checks that released cassandra version works with ongoing flink iterations - # and that ongoing cassandra iteration works with released flink version - flink_branches: [{ - flink: 1.18-SNAPSHOT, - branch: v3.1 - }, { - flink: 1.19-SNAPSHOT, - branch: v3.1 - }, { - flink: 1.17.1, - branch: main - }, { - flink: 1.18.0, - branch: main - }] uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils with: - flink_version: ${{ matrix.flink_branches.flink }} - connector_branch: ${{ matrix.flink_branches.branch }} + flink_version: 1.17.2 + connector_branch: main + skip_archunit_tests: true + main-version: + if: github.repository_owner == 'apache' + uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils + with: + flink_version: 1.18.0 + connector_branch: main + # tests that current Flink iterations do not break compatibility with current connector iteration + # (cannot test with released connector version because this version cannot skip archunit tests for now) + current-snapshot: + if: github.repository_owner == 'apache' + uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils + with: + flink_version: 1.19-SNAPSHOT + connector_branch: main + skip_archunit_tests: true run_dependency_convergence: false + previous-snapshot: + if: github.repository_owner == 'apache' + uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils + with: + flink_version: 1.18-SNAPSHOT + connector_branch: main + skip_archunit_tests: true + run_dependency_convergence: false + diff --git a/flink-connector-cassandra/archunit-violations/7c16ca6f-4479-46d5-80cf-4f766ee5b442 b/flink-connector-cassandra/archunit-violations/7c16ca6f-4479-46d5-80cf-4f766ee5b442 new file mode 100644 index 00000000..e69de29b diff --git a/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201 b/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201 index 84849574..f80e520f 100644 --- a/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201 +++ b/flink-connector-cassandra/archunit-violations/dc1ba6f4-3d84-498c-a085-e02ba5936201 @@ -1,12 +1,6 @@ -org.apache.flink.connector.cassandra.source.CassandraSourceITCase does not satisfy: only one of the following predicates match:\ -* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\ -* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\ -* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\ -* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\ - or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule org.apache.flink.streaming.connectors.cassandra.CassandraConnectorITCase does not satisfy: only one of the following predicates match:\ * reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\ -* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\ +* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension or are , and of type MiniClusterTestEnvironment and annotated with @TestEnv\ * reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\ * reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\ or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule \ No newline at end of file diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml index 5d783315..74833e3a 100644 --- a/flink-connector-cassandra/pom.xml +++ b/flink-connector-cassandra/pom.xml @@ -44,7 +44,7 @@ under the License. 5.8.1 3.23.1 1.0.0 - 1.17.2 + 1.18.3 3.4.6 1.12.10 1.3.9 @@ -183,11 +183,6 @@ under the License. - - org.junit.jupiter - junit-jupiter - test - org.assertj @@ -209,6 +204,13 @@ under the License. junit-jupiter ${testcontainers.version} test + + + + org.apache.commons + commons-compress + + diff --git a/pom.xml b/pom.xml index 97b4822a..4f52479d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.flink flink-connector-parent - 1.0.0 + 1.1.0 4.0.0 @@ -42,7 +42,7 @@ under the License. - 1.17.1 + 1.18.0 3.0.0-1.16 diff --git a/tools/releasing/shared b/tools/releasing/shared deleted file mode 160000 index fdad9aa8..00000000 --- a/tools/releasing/shared +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fdad9aa86c0764a30dacf342c9b8ff0068f68fc3