[
https://issues.apache.org/jira/browse/BEAM-5931?focusedWorklogId=164068&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-164068
]
ASF GitHub Bot logged work on BEAM-5931:
----------------------------------------
Author: ASF GitHub Bot
Created on: 08/Nov/18 20:17
Start Date: 08/Nov/18 20:17
Worklog Time Spent: 10m
Work Description: lukecwik closed pull request #6966: [BEAM-5931] Add
worker jar to integrationTest targets.
URL: https://github.com/apache/beam/pull/6966
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/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 26d2834fa7e..783522d4e87 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -20,6 +20,7 @@ package org.apache.beam.gradle
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
import org.gradle.api.GradleException
import org.gradle.api.Plugin
import org.gradle.api.Project
@@ -1139,7 +1140,23 @@ artifactId=${project.name}
outputs.upToDateWhen { false }
include "**/*IT.class"
- systemProperties.beamTestPipelineOptions =
configuration.integrationTestPipelineOptions
+
+ def pipelineOptionsString =
configuration.integrationTestPipelineOptions
+ if(pipelineOptionsString &&
configuration.runner?.equalsIgnoreCase('dataflow')) {
+
project.evaluationDependsOn(":beam-runners-google-cloud-dataflow-java-legacy-worker")
+ def allOptionsList = (new
JsonSlurper()).parseText(pipelineOptionsString)
+ def dataflowWorkerJar = project.findProperty('dataflowWorkerJar') ?:
+
project.project(":beam-runners-google-cloud-dataflow-java-legacy-worker").shadowJar.archivePath
+
+ allOptionsList.addAll([
+ '--workerHarnessContainerImage=',
+ '--dataflowWorkerJar=${dataflowWorkerJar}',
+ ])
+
+ pipelineOptionsString = JsonOutput.toJson(allOptionsList)
+ }
+
+ systemProperties.beamTestPipelineOptions = pipelineOptionsString
}
}
@@ -1159,6 +1176,7 @@ artifactId=${project.name}
//if (runner?.contains('dataflow')) {
if (runner?.equalsIgnoreCase('dataflow')) {
testCompile it.project(path:
":beam-runners-google-cloud-dataflow-java", configuration: 'shadowTest')
+ shadow it.project(path:
":beam-runners-google-cloud-dataflow-java-legacy-worker", configuration:
'shadow')
}
if (runner?.equalsIgnoreCase('direct')) {
----------------------------------------------------------------
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:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 164068)
Time Spent: 7h 10m (was: 7h)
> Rollback PR/6899
> ----------------
>
> Key: BEAM-5931
> URL: https://issues.apache.org/jira/browse/BEAM-5931
> Project: Beam
> Issue Type: Task
> Components: beam-model, runner-dataflow
> Reporter: Luke Cwik
> Assignee: Ruoyun Huang
> Priority: Major
> Time Spent: 7h 10m
> Remaining Estimate: 0h
>
> To rollback this change, one must either:
> 1) Update nexmark / perf test framework to use Dataflow worker jar.
> This requires adding the
> {code}
> "--dataflowWorkerJar=${dataflowWorkerJar}",
> "--workerHarnessContainerImage=",
> {code}
> when running the tests.
> OR
> 2) Update the dataflow worker image with code that contains the rollback of
> PR/6899 and then rollback PR/6899 in Github with the updated Dataflow worker
> image.
> #1 is preferable since we will no longer have tests running that don't use a
> Dataflow worker jar built from Github HEAD.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
