Merge pull request #39077 from Abacn/fix-flink-xvr

Fix Flink XVR Tests for Flink 2

Author: Amar3tto

.github/trigger_files/beam_PostCommit_Go_VR_Flink.json

@@ -1,6 +1,6 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "modification": 2,
+  "modification": 3,
   "https://github.com/apache/beam/pull/32440": "testing datastream optimizations",
   "pr": "37640"
 }

.github/trigger_files/beam_PostCommit_XVR_Flink.json

@@ -1,4 +1,4 @@
 {
-  "modification": 2,
+  "modification": 3,
   "trigger-2026-04-04": "portable_runner expand_sdf opt-in"
 }

.github/trigger_files/beam_PostCommit_XVR_Samza.json

@@ -75,8 +75,8 @@
 * (Java) Enabled state tag encoding v2 by default for new Dataflow Streaming Engine jobs. It can be disabled by passing `--experiments=disable_streaming_engine_state_tag_encoding_v2` or `--updateCompatibilityVersion=2.74.0` pipeline option. Note that the tag encoding version cannot change during a job update. Jobs using tag encoding v2 (enabled by default for new jobs on 2.75.0+) cannot be downgraded to Beam versions prior to 2.73.0, as only versions 2.73.0 and later support tag encoding v2. ([#38705](https://github.com/apache/beam/issues/38705)).
 * (Python) Added instrumentation to support off-the-shelf profiling agents when launching Python SDK Harness ([#38853](https://github.com/apache/beam/issues/38853)).
 * (Java) Added support to the FnApi Data stream protocol allowing runners to isolate bundles slowly processing input from other bundles. ([#39001](https://github.com/apache/beam/issues/39001)).
-* (Java) Flink 2.1 support added ([#38947](https://github.com/apache/beam/issues/38947)).
-* (Java) Flink 2.2 support added ([#38978](https://github.com/apache/beam/issues/38978)).
+* (Java) Flink 2.1 and 2.2 support is added ([#38947](https://github.com/apache/beam/issues/38947)) ([#38978](https://github.com/apache/beam/issues/38978)); Flink 1.17 and 1.18 support is dropped.
+* (Python) MqttIO is now supported in Python via cross-language ([#21060](https://github.com/apache/beam/issues/21060)).
 
 ## Breaking Changes
 

CHANGES.md

@@ -248,10 +248,26 @@ def setupTask = project.tasks.register("flinkJobServerSetup", Exec) {
   def flinkJobServerJar = shadowJar.archivePath
   def flinkDir = project.project(":runners:flink").projectDir
   def additionalArgs = ""
-  if (project.hasProperty('flinkConfDir'))
+
+  if (project.hasProperty('flinkConfDir')) {
     additionalArgs += " --flink-conf-dir=${project.property('flinkConfDir')}"
-  else
+  }
+  else if (isFlink2) {
+    def flinkConfDir = "$flinkDir/2.0/src/test/resources"
+    additionalArgs += "--flink-conf-dir=${project.buildDir}/flink-conf"
+
+    doFirst {
+      copy {
+        from "$flinkDir/2.0/src/test/resources/flink-test-config.yaml"
+        into "${project.buildDir}/flink-conf"
+
+        // Rename the file during the copy process
+        rename 'flink-test-config.yaml', 'config.yaml'
+      }
+    }
+  } else {
     additionalArgs += "--flink-conf-dir=$flinkDir/src/test/resources"
+  }
 
   executable 'sh'
   args '-c', "$pythonDir/scripts/run_job_server.sh stop --group_id ${project.name} && $pythonDir/scripts/run_job_server.sh start --group_id ${project.name} --job_port ${jobPort} --artifact_port ${artifactPort} --job_server_jar ${flinkJobServerJar} --additional_args \"${additionalArgs}\""

runners/flink/job-server/flink_job_server.gradle

@@ -92,7 +92,7 @@ task flinkValidatesRunner {
   doFirst {
     // Copy Flink conf file
     copy {
-      from "${project.rootDir}/runners/flink/${flinkVersion}/src/test/resources/flink-test-config.yaml"
+      from "${project.rootDir}/runners/flink/2.0/src/test/resources/flink-test-config.yaml"
       into "${project.buildDir}/flink-conf"
 
       // Rename the file during the copy process

sdks/go/test/build.gradle

@@ -358,12 +358,12 @@ To find out which version of Flink is compatible with Beam please see the table
 <tr>
   <td>1.18.x</td>
   <td>beam-runners-flink-1.18</td>
-  <td>&ge; 2.57.0</td>
+  <td>2.57.0 - 2.74.0</td>
 </tr>
 <tr>
   <td>1.17.x</td>
   <td>beam-runners-flink-1.17</td>
-  <td>&ge; 2.56.0</td>
+  <td>2.56.0 - 2.74.0</td>
 </tr>
 <tr>
   <td>1.16.x</td>