[FLINK-34002] Bump CI flink version on flink-connector-elasticsearch …

…to support Flink 1.19. This closes apache#86 * [FLINK-34002] Bump CI Flink version on flink-connector-elasticsearch to support Flink 1.19 * [FLINK-34002] Java 17 support for connector * Make tests passing for jdk 17+ --------- Co-authored-by: Sergey Nuyanzin <snuyanzin@gmail.com> (cherry picked from commit 52f2afd)
MartijnVisser · Jan 8, 2024 · 1ca03b4 · 1ca03b4
1 parent d5cc749
commit 1ca03b4
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 4 deletions.
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
@@ -16,13 +16,23 @@
 # limitations under the License.
 ################################################################################
 
-name: Build flink-connector-elasticsearch
+name: CI
 on: [push, pull_request]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   compile_and_test:
+    strategy:
+      matrix:
+        flink: [ 1.16-SNAPSHOT, 1.17-SNAPSHOT ]
+        jdk: [ '8, 11' ]
+        include:
+          - flink: 1.18-SNAPSHOT
+            jdk: '8, 11, 17'
+          - flink: 1.19-SNAPSHOT
+            jdk: '8, 11, 17, 21'
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
-      flink_version: 1.16.2
+      flink_version: ${{ matrix.flink }}
+      jdk_version: ${{ matrix.jdk }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -26,8 +26,34 @@ jobs:
     if: github.repository_owner == 'apache'
     strategy:
       matrix:
-        flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT]
+        flink_branches: [{
+          flink: 1.16-SNAPSHOT,
+          branch: main
+        }, {
+          flink: 1.17-SNAPSHOT,
+          branch: main
+        }, {
+          flink: 1.18-SNAPSHOT,
+          jdk: '8, 11, 17',
+          branch: main
+        }, {
+          flink: 1.19-SNAPSHOT,
+          jdk: '8, 11, 17, 21',
+          branch: main
+        }, {
+          flink: 1.16.2,
+          branch: v3.0
+        }, {
+          flink: 1.17.1,
+          branch: v3.0
+        }, {
+          flink: 1.18.0,
+          jdk: '8, 11, 17',
+          branch: v3.0
+        }]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
-      flink_version: ${{ matrix.flink }}
+      flink_version: ${{ matrix.flink_branches.flink }}
+      connector_branch: ${{ matrix.flink_branches.branch }}
+      jdk_version: ${{ matrix.flink_branches.jdk || '8, 11' }}
       run_dependency_convergence: false
diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch6-e2e-tests/pom.xml
@@ -35,6 +35,8 @@ under the License.
 
 	<properties>
 		<elasticsearch.version>6.8.20</elasticsearch.version>
+		<surefire.module.config><!-- required by
+		Elasticsearch6SinkE2ECase -->  --add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
 	</properties>
 
 	<dependencies>

diff --git a/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/flink-connector-elasticsearch7-e2e-tests/pom.xml
@@ -35,6 +35,8 @@ under the License.
 
 	<properties>
 		<elasticsearch.version>7.10.2</elasticsearch.version>
+		<surefire.module.config><!-- required by
+		Elasticsearch7SinkE2ECase -->  --add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
 	</properties>
 
 	<dependencies>

diff --git a/flink-connector-elasticsearch-e2e-tests/pom.xml b/flink-connector-elasticsearch-e2e-tests/pom.xml
@@ -39,6 +39,11 @@ under the License.
 		<module>flink-connector-elasticsearch7-e2e-tests</module>
     </modules>
 
+	<properties>
+		<surefire.module.config><!-- required by
+		Elasticsearch6SinkE2ECase -->  --add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
+	</properties>
+
 	<profiles>
 		<profile>
 			<id>run-end-to-end-tests</id>
@@ -63,6 +68,7 @@ under the License.
 									<systemPropertyVariables>
 										<moduleDir>${project.basedir}</moduleDir>
 									</systemPropertyVariables>
+									<argLine>${flink.surefire.baseArgLine} -Xmx${flink.XmxUnitTest}</argLine>
 								</configuration>
 							</execution>
 						</executions>

diff --git a/flink-connector-elasticsearch6/pom.xml b/flink-connector-elasticsearch6/pom.xml
@@ -37,6 +37,8 @@ under the License.
 	<!-- Allow users to pass custom connector versions -->
 	<properties>
 		<elasticsearch.version>6.8.20</elasticsearch.version>
+		<surefire.module.config><!-- required by
+		Elasticsearch6DynamicSinkITCase -->  --add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
 	</properties>
 
 	<dependencies>

diff --git a/flink-connector-elasticsearch7/pom.xml b/flink-connector-elasticsearch7/pom.xml
@@ -37,6 +37,8 @@ under the License.
 	<!-- Allow users to pass custom connector versions -->
 	<properties>
 		<elasticsearch.version>7.10.2</elasticsearch.version>
+		<surefire.module.config><!-- required by
+		Elasticsearch7DynamicSinkITCase -->  --add-opens=java.base/java.util=ALL-UNNAMED </surefire.module.config>
 	</properties>
 
 	<dependencies>

diff --git a/pom.xml b/pom.xml
@@ -69,6 +69,9 @@ under the License.
 		<test.randomization.seed/>
 
 		<flink.parent.artifactId>flink-connector-elasticsearch-parent</flink.parent.artifactId>
+		<!-- These 2 properties should be removed together with upgrade of flink-connector-parent to 1.1.x -->
+		<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config}</flink.surefire.baseArgLine>
+		<surefire.module.config/>
 	</properties>
 
 	<dependencies>