Skip to content

Commit d2e34c4

Browse files
committed
Still run Go VR on Flink 1.20
1 parent d78249f commit d2e34c4

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

sdks/go/test/build.gradle

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,31 @@ task dataflowValidatesRunnerARM64() {
7979
task flinkValidatesRunner {
8080
group = "Verification"
8181

82+
// TODO(https://github.com/apache/beam/issues/37600) use project.ext.latestFlinkVersion after resolved
83+
def flinkVersion = '1.20'
84+
8285
dependsOn ":sdks:go:test:goBuild"
8386
dependsOn ":sdks:go:container:docker"
8487
dependsOn ":sdks:java:container:${project.ext.currentJavaVersion}:docker"
85-
dependsOn ":runners:flink:${project.ext.latestFlinkVersion}:job-server:shadowJar"
88+
dependsOn ":runners:flink:${flinkVersion}:job-server:shadowJar"
8689
dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
90+
doFirst {
91+
// Copy Flink conf file
92+
copy {
93+
from "${project.rootDir}/runners/flink/2.0/src/test/resources/flink-test-config.yaml"
94+
into "${project.buildDir}/flink-conf"
95+
96+
// Rename the file during the copy process
97+
rename 'flink-test-config.yaml', 'config.yaml'
98+
}
99+
}
87100
doLast {
88101
def pipelineOptions = [ // Pipeline options piped directly to Go SDK flags.
89102
"--expansion_jar=test:${project(":sdks:java:testing:expansion-service").buildTestExpansionServiceJar.archivePath}",
90103
]
91104
def options = [
92105
"--runner flink",
93-
"--flink_job_server_jar ${project(":runners:flink:${project.ext.latestFlinkVersion}:job-server").shadowJar.archivePath}",
106+
"--flink_job_server_jar ${project(":runners:flink:${flinkVersion}:job-server").shadowJar.archivePath}",
94107
"--pipeline_opts \"${pipelineOptions.join(' ')}\"",
95108
]
96109
exec {

sdks/go/test/run_validatesrunner_tests.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,13 @@ if [[ "$RUNNER" == "flink" || "$RUNNER" == "spark" || "$RUNNER" == "samza" || "$
273273
echo "No endpoint specified; starting a new $RUNNER job server on $ENDPOINT"
274274
if [[ "$RUNNER" == "flink" ]]; then
275275
"$JAVA_CMD" \
276+
-Dslf4j.provider=org.slf4j.simple.SimpleServiceProvider \
277+
-Dorg.slf4j.simpleLogger.log.org.apache.flink.metrics=error \
278+
-Dorg.slf4j.simpleLogger.log.org.apache.flink.runtime=error \
279+
-Dorg.slf4j.simpleLogger.log.org.apache.flink.streaming=error \
276280
-jar $FLINK_JOB_SERVER_JAR \
277281
--flink-master [local] \
278-
--flink-conf-dir $CURRENT_DIRECTORY/../../../runners/flink/src/test/resources \
282+
--flink-conf-dir $CURRENT_DIRECTORY/build/flink-conf/ \
279283
--job-port $JOB_PORT \
280284
--expansion-port 0 \
281285
--artifact-port 0 &

sdks/python/apache_beam/runners/portability/flink_runner_test.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,10 @@ def _subprocess_command(cls, job_port, expansion_port):
182182
'--add-opens=java.base/java.lang=ALL-UNNAMED',
183183
'--add-opens=java.base/java.nio=ALL-UNNAMED',
184184
'--add-opens=java.base/java.util=ALL-UNNAMED',
185-
'-Dorg.slf4j.simpleLogger.defaultLogLevel=warn',
185+
'-Dslf4j.provider=org.slf4j.simple.SimpleServiceProvider',
186+
'-Dorg.slf4j.simpleLogger.log.org.apache.flink.metrics=error',
187+
'-Dorg.slf4j.simpleLogger.log.org.apache.flink.runtime=error',
188+
'-Dorg.slf4j.simpleLogger.log.org.apache.flink.streaming=error',
186189
'-jar',
187190
cls.flink_job_server_jar,
188191
'--flink-master',

0 commit comments

Comments
 (0)