You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by he...@apache.org on 2022/01/31 23:00:13 UTC
[beam] branch master updated: Fix Java SDK container image name for load-tests and nexmark
This is an automated email from the ASF dual-hosted git repository.
heejong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 4865ca4 Fix Java SDK container image name for load-tests and nexmark
new 10da5af Merge pull request #16645 from ihji/fix_nexmark_dataflow_v2
4865ca4 is described below
commit 4865ca4677bcfca351c0ac6bf01b299a03bf5629
Author: Heejong Lee <he...@gmail.com>
AuthorDate: Fri Jan 28 11:56:52 2022 -0800
Fix Java SDK container image name for load-tests and nexmark
---
sdks/java/testing/load-tests/build.gradle | 6 +++---
sdks/java/testing/nexmark/build.gradle | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sdks/java/testing/load-tests/build.gradle b/sdks/java/testing/load-tests/build.gradle
index 49b6a81..2d93993 100644
--- a/sdks/java/testing/load-tests/build.gradle
+++ b/sdks/java/testing/load-tests/build.gradle
@@ -110,7 +110,7 @@ def getLoadTestArgs = {
if (isDataflowRunner) {
if (isDataflowRunnerV2) {
loadTestArgsList.add("--experiments=beam_fn_api,use_unified_worker,use_runner_v2,shuffle_mode=service")
- def sdkContainerImage = project.findProperty('sdkContainerImage') ?: project(":runners:google-cloud-dataflow-java").dockerImageName
+ def sdkContainerImage = project.findProperty('sdkContainerImage') ?: project(":runners:google-cloud-dataflow-java").dockerJavaImageName
loadTestArgsList.add("--sdkContainerImage=${sdkContainerImage}")
} else {
def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?: project(":runners:google-cloud-dataflow-java:worker:legacy-worker").shadowJar.archivePath
@@ -128,8 +128,8 @@ task run(type: JavaExec) {
def loadTestArgsList = getLoadTestArgs()
if (isDataflowRunner) {
if (isDataflowRunnerV2){
- dependsOn ":runners:google-cloud-dataflow-java:buildAndPushDockerContainer"
- finalizedBy ":runners:google-cloud-dataflow-java:cleanUpDockerImages"
+ dependsOn ":runners:google-cloud-dataflow-java:buildAndPushDockerJavaContainer"
+ finalizedBy ":runners:google-cloud-dataflow-java:cleanUpDockerJavaImages"
} else {
dependsOn ":runners:google-cloud-dataflow-java:worker:legacy-worker:shadowJar"
}
diff --git a/sdks/java/testing/nexmark/build.gradle b/sdks/java/testing/nexmark/build.gradle
index e7c1a7e..3537397 100644
--- a/sdks/java/testing/nexmark/build.gradle
+++ b/sdks/java/testing/nexmark/build.gradle
@@ -132,7 +132,7 @@ def getNexmarkArgs = {
if (isDataflowRunner) {
if (isDataflowRunnerV2) {
nexmarkArgsList.add("--experiments=beam_fn_api,use_unified_worker,use_runner_v2,shuffle_mode=service")
- def sdkContainerImage = project.findProperty('sdkContainerImage') ?: project(":runners:google-cloud-dataflow-java").dockerImageName
+ def sdkContainerImage = project.findProperty('sdkContainerImage') ?: project(":runners:google-cloud-dataflow-java").dockerJavaImageName
nexmarkArgsList.add("--sdkContainerImage=${sdkContainerImage}")
// TODO(BEAM-12295) enable all queries once issues with runner V2 is fixed.
@@ -171,8 +171,8 @@ task run(type: JavaExec) {
def nexmarkArgsList = getNexmarkArgs()
if (isDataflowRunner) {
if (isDataflowRunnerV2) {
- dependsOn ":runners:google-cloud-dataflow-java:buildAndPushDockerContainer"
- finalizedBy ":runners:google-cloud-dataflow-java:cleanUpDockerImages"
+ dependsOn ":runners:google-cloud-dataflow-java:buildAndPushDockerJavaContainer"
+ finalizedBy ":runners:google-cloud-dataflow-java:cleanUpDockerJavaImages"
} else {
dependsOn ":runners:google-cloud-dataflow-java:worker:legacy-worker:shadowJar"
}
@@ -180,4 +180,4 @@ task run(type: JavaExec) {
mainClass = "org.apache.beam.sdk.nexmark.Main"
classpath = configurations.gradleRun
args nexmarkArgsList.toArray()
-}
\ No newline at end of file
+}