[
https://issues.apache.org/jira/browse/BEAM-6936?focusedWorklogId=222913&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-222913
]
ASF GitHub Bot logged work on BEAM-6936:
----------------------------------------
Author: ASF GitHub Bot
Created on: 04/Apr/19 10:40
Start Date: 04/Apr/19 10:40
Worklog Time Spent: 10m
Work Description: mwalenia commented on pull request #8183: [BEAM-6936]
Added Jenkins jobs running Java examples on Dataflow with Java 11
URL: https://github.com/apache/beam/pull/8183#discussion_r272119985
##########
File path: runners/google-cloud-dataflow-java/examples/build.gradle
##########
@@ -42,57 +42,60 @@ def dockerImageName =
project(':beam-runners-google-cloud-dataflow-java').ext.do
// If -PuseExecutableStage is set, the use_executable_stage_bundle_execution
wil be enabled.
def fnapiExperiments = project.hasProperty('useExecutableStage') ?
'beam_fn_api,use_executable_stage_bundle_execution' : "beam_fn_api"
+// we require dataflowWorker, optional workerHarnessContainerImage and
optional additionalOptions
+def commonConfig = { dataflowWorkerJar, workerHarnessContainerImage = '',
additionalOptions = [] ->
+ // return the preevaluated configuration closure
+ return {
+ testClassesDirs =
files(project(":beam-examples-java").sourceSets.test.output.classesDirs)
+ include "**/WordCountIT.class"
+ include "**/WindowedWordCountIT.class"
+ forkEvery 1
+ maxParallelForks 4
+
+ def preCommitBeamTestPipelineOptions = [
+ "--project=${gcpProject}",
+ "--tempRoot=${gcsTempRoot}",
+ "--runner=TestDataflowRunner",
+ "--dataflowWorkerJar=${dataflowWorkerJar}",
+ workerHarnessContainerImage.isEmpty()
?'':"--workerHarnessContainerImage=${workerHarnessContainerImage}"
+ ] + additionalOptions
+ systemProperty "beamTestPipelineOptions",
JsonOutput.toJson(preCommitBeamTestPipelineOptions)
+ }
+ }
+
task preCommitLegacyWorker(type: Test) {
dependsOn ":beam-runners-google-cloud-dataflow-java-legacy-worker:shadowJar"
def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?:
project(":beam-runners-google-cloud-dataflow-java-legacy-worker").shadowJar.archivePath
-
- //Set workerHarnessContainerImage to empty to make Dataflow pick up the
non-versioned container
- //image, which handles a staged worker jar.
- def preCommitBeamTestPipelineOptions = [
- "--project=${gcpProject}",
- "--tempRoot=${gcsTempRoot}",
- "--runner=TestDataflowRunner",
- "--dataflowWorkerJar=${dataflowWorkerJar}",
- "--workerHarnessContainerImage=",
- ]
- testClassesDirs =
files(project(":beam-examples-java").sourceSets.test.output.classesDirs)
- include "**/WordCountIT.class"
- include "**/WindowedWordCountIT.class"
- forkEvery 1
- maxParallelForks 4
- systemProperty "beamTestPipelineOptions",
JsonOutput.toJson(preCommitBeamTestPipelineOptions)
+ with commonConfig(dataflowWorkerJar)
}
-task preCommitFnApiWorker(type: Test) {
+task verifyFnApiWorker(type: Test) {
dependsOn ":beam-runners-google-cloud-dataflow-java-fn-api-worker:shadowJar"
dependsOn
":beam-runners-google-cloud-dataflow-java:buildAndPushDockerContainer"
-
def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?:
project(":beam-runners-google-cloud-dataflow-java-fn-api-worker").shadowJar.archivePath
- def preCommitBeamTestPipelineOptions = [
- "--project=${gcpProject}",
- "--tempRoot=${gcsTempRoot}",
- "--runner=TestDataflowRunner",
- "--dataflowWorkerJar=${dataflowWorkerJar}",
- "--workerHarnessContainerImage=${dockerImageName}",
- "--experiments=${fnapiExperiments}",
Review comment:
Right, I missed it. Added it back
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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: 222913)
Time Spent: 2h 50m (was: 2h 40m)
> Add a Jenkins job running Java examples on Java 11 Dataflow
> -----------------------------------------------------------
>
> Key: BEAM-6936
> URL: https://issues.apache.org/jira/browse/BEAM-6936
> Project: Beam
> Issue Type: Sub-task
> Components: examples-java, testing
> Reporter: Michal Walenia
> Assignee: Michal Walenia
> Priority: Minor
> Time Spent: 2h 50m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
