[
https://issues.apache.org/jira/browse/BEAM-3250?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16336985#comment-16336985
]
ASF GitHub Bot commented on BEAM-3250:
--------------------------------------
lukecwik closed pull request #4436: [BEAM-3250] Migrate Flink ValidatesRunner
to Gradle
URL: https://github.com/apache/beam/pull/4436
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/runners/flink/build.gradle b/runners/flink/build.gradle
index 2e8f281f886..4ca9558e4fd 100644
--- a/runners/flink/build.gradle
+++ b/runners/flink/build.gradle
@@ -16,6 +16,8 @@
* limitations under the License.
*/
+import groovy.json.JsonOutput
+
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
@@ -30,6 +32,7 @@ description = "Apache Beam :: Runners :: Flink"
*/
evaluationDependsOn(":model:fn-execution")
evaluationDependsOn(":runners:core-java")
+evaluationDependsOn(":sdks:java:core")
test {
systemProperty "log4j.configuration", "log4j-test.properties"
@@ -39,6 +42,10 @@ test {
}
}
+configurations {
+ validatesRunner
+}
+
def flink_version = "1.4.0"
dependencies {
@@ -57,19 +64,58 @@ dependencies {
shadow "org.apache.flink:flink-java:$flink_version"
shadow "org.apache.flink:flink-runtime_2.11:$flink_version"
shadow "org.apache.flink:flink-streaming-java_2.11:$flink_version"
- testCompile project(path: ":sdks:java:core", configuration: "shadowTest")
- testCompile project(":model:fn-execution").sourceSets.test.output
- testCompile project(":runners:core-java").sourceSets.test.output
- testCompile library.java.commons_lang3
- testCompile library.java.hamcrest_core
- testCompile library.java.junit
- testCompile library.java.mockito_core
- testCompile library.java.google_api_services_bigquery
- testCompile library.java.jackson_dataformat_yaml
- testCompile "org.apache.flink:flink-core:$flink_version:tests"
- testCompile "org.apache.flink:flink-runtime_2.11:$flink_version:tests"
- testCompile "org.apache.flink:flink-streaming-java_2.11:$flink_version:tests"
- testCompile "org.apache.flink:flink-test-utils_2.11:$flink_version"
+ shadowTest project(path: ":sdks:java:core", configuration: "shadowTest")
+ shadowTest project(":model:fn-execution").sourceSets.test.output
+ shadowTest project(":runners:core-java").sourceSets.test.output
+ shadowTest library.java.commons_lang3
+ shadowTest library.java.hamcrest_core
+ shadowTest library.java.junit
+ shadowTest library.java.mockito_core
+ shadowTest library.java.google_api_services_bigquery
+ shadowTest library.java.jackson_dataformat_yaml
+ shadowTest "org.apache.flink:flink-core:$flink_version:tests"
+ shadowTest "org.apache.flink:flink-runtime_2.11:$flink_version:tests"
+ shadowTest "org.apache.flink:flink-streaming-java_2.11:$flink_version:tests"
+ shadowTest "org.apache.flink:flink-test-utils_2.11:$flink_version"
+ validatesRunner project(path: ":sdks:java:core", configuration: "shadowTest")
+ validatesRunner project(path: project.path, configuration: "shadow")
+}
+
+class ValidatesRunnerConfig {
+ String name
+ boolean streaming
+}
+
+def createValidatesRunnerTask(Map m) {
+ def config = m as ValidatesRunnerConfig
+ tasks.create(name: config.name, type: Test) {
+ group = "Verification"
+ def runnerType = config.streaming ? "streaming" : "batch"
+ description = "Validates the ${runnerType} runner"
+ def pipelineOptions = JsonOutput.toJson(["--runner=TestFlinkRunner",
"--streaming=${config.streaming}"])
+ systemProperty "beamTestPipelineOptions", pipelineOptions
+ classpath = configurations.validatesRunner
+ testClassesDirs =
files(project(":sdks:java:core").sourceSets.test.output.classesDirs)
+ maxParallelForks 4
+ useJUnit {
+ includeCategories 'org.apache.beam.sdk.testing.ValidatesRunner'
+ excludeCategories
'org.apache.beam.sdk.testing.FlattenWithHeterogeneousCoders'
+ excludeCategories 'org.apache.beam.sdk.testing.LargeKeys$Above100MB'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesSplittableParDo'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesCommittedMetrics'
+ excludeCategories 'org.apache.beam.sdk.testing.UsesTestStream'
+ }
+ }
+}
+
+createValidatesRunnerTask(name: "validatesRunnerBatch", streaming: false)
+createValidatesRunnerTask(name: "validatesRunnerStreaming", streaming: true)
+
+task validatesRunner {
+ group = "Verification"
+ description "Validates batch and streaming runners"
+ dependsOn validatesRunnerBatch
+ dependsOn validatesRunnerStreaming
}
task packageTests(type: Jar) {
----------------------------------------------------------------
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]
> Migrate ValidatesRunner Jenkins PostCommits to Gradle
> -----------------------------------------------------
>
> Key: BEAM-3250
> URL: https://issues.apache.org/jira/browse/BEAM-3250
> Project: Beam
> Issue Type: Sub-task
> Components: build-system, testing
> Reporter: Luke Cwik
> Assignee: Ben Sidhom
> Priority: Major
>
> Update these targets to execute ValidatesRunner tests:
> https://github.com/apache/beam/search?l=Groovy&q=ValidatesRunner&type=&utf8=%E2%9C%93
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
