[
https://issues.apache.org/jira/browse/BEAM-5660?focusedWorklogId=152847&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-152847
]
ASF GitHub Bot logged work on BEAM-5660:
----------------------------------------
Author: ASF GitHub Bot
Created on: 09/Oct/18 18:36
Start Date: 09/Oct/18 18:36
Worklog Time Spent: 10m
Work Description: herohde closed pull request #6613: [BEAM-5660] Add both
dataflow legacy worker and fn-api worker into JavaPreCommit
URL: https://github.com/apache/beam/pull/6613
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.gradle b/build.gradle
index 63ee9d4d044..cc98ac9110f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -187,6 +187,8 @@ task javaPreCommit() {
dependsOn ":beam-model-pipeline:build"
dependsOn ":beam-model-job-management:build"
dependsOn ":beam-model-fn-execution:build"
+ dependsOn ":beam-runners-google-cloud-dataflow-java-legacy-worker:build"
+ dependsOn ":beam-runners-google-cloud-dataflow-java-fn-api-worker:build"
dependsOn ":beam-sdks-java-core:buildNeeded"
dependsOn ":beam-sdks-java-core:buildDependents"
dependsOn ":beam-examples-java:preCommit"
diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle
b/runners/google-cloud-dataflow-java/worker/build.gradle
index d28b162ce2c..3ec6df1e265 100644
--- a/runners/google-cloud-dataflow-java/worker/build.gradle
+++ b/runners/google-cloud-dataflow-java/worker/build.gradle
@@ -39,7 +39,7 @@ def DATAFLOW_VERSION = "dataflow.version"
// Use -PisLegacyWorker in Gradle command if build legacy worker, otherwise,
// FnAPI worker is considered as default.
def is_legacy_worker = {
- return project.hasProperty("isLegacyWorker")
+ return project.name.contains("dataflow-java-legacy-worker")
}
// Get full dependency of 'com.google.apis:google-api-services-dataflow'
@@ -99,9 +99,6 @@ applyJavaNature(validateShadowJar: false, shadowClosure:
DEFAULT_SHADOW_CLOSURE
}
}
- // Archive name pattern: ${name}-${appendix}-${version}-${classifier}.jar
- appendix = is_legacy_worker() ? "legacy-bundled" : "fnapi-bundled"
-
// Include original source files extracted under
// '$buildDir/original_sources_to_package' to jar
from "$buildDir/original_sources_to_package"
diff --git a/settings.gradle b/settings.gradle
index dfdc5577173..9f99894b34a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -178,7 +178,9 @@ include "beam-vendor-sdks-java-extensions-protobuf"
project(":beam-vendor-sdks-java-extensions-protobuf").dir =
file("vendor/sdks-java-extensions-protobuf")
include "beam-website"
project(":beam-website").dir = file("website")
-include "beam-runners-google-cloud-dataflow-java-worker"
-project(":beam-runners-google-cloud-dataflow-java-worker").dir =
file("runners/google-cloud-dataflow-java/worker")
+include "beam-runners-google-cloud-dataflow-java-legacy-worker"
+project(":beam-runners-google-cloud-dataflow-java-legacy-worker").dir =
file("runners/google-cloud-dataflow-java/worker")
+include "beam-runners-google-cloud-dataflow-java-fn-api-worker"
+project(":beam-runners-google-cloud-dataflow-java-fn-api-worker").dir =
file("runners/google-cloud-dataflow-java/worker")
include "beam-runners-google-cloud-dataflow-java-windmill"
project(":beam-runners-google-cloud-dataflow-java-windmill").dir =
file("runners/google-cloud-dataflow-java/worker/windmill")
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 152847)
Time Spent: 40m (was: 0.5h)
> Add dataflow java worker unit tests into precommit
> --------------------------------------------------
>
> Key: BEAM-5660
> URL: https://issues.apache.org/jira/browse/BEAM-5660
> Project: Beam
> Issue Type: Task
> Components: runner-dataflow
> Reporter: Boyuan Zhang
> Assignee: Boyuan Zhang
> Priority: Major
> Time Spent: 40m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
