This is an automated email from the ASF dual-hosted git repository.
amaliujia 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 3615801 [BEAM-12334] Re-use java 11 flag in build.gradle (#14892)
3615801 is described below
commit 36158013318fcfd7f18a432ccbc9b18b945a430c
Author: kileys <[email protected]>
AuthorDate: Tue Jun 15 16:47:09 2021 -0700
[BEAM-12334] Re-use java 11 flag in build.gradle (#14892)
---
.test-infra/jenkins/NexmarkBuilder.groovy | 14 ++++++++++-
.../job_PostCommit_Java_Nexmark_Dataflow_V2.groovy | 4 ++--
...stCommit_Java_Nexmark_Dataflow_V2_Java11.groovy | 4 ++--
sdks/java/testing/nexmark/build.gradle | 27 ----------------------
4 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/.test-infra/jenkins/NexmarkBuilder.groovy
b/.test-infra/jenkins/NexmarkBuilder.groovy
index 1841a3e..d50cc6f 100644
--- a/.test-infra/jenkins/NexmarkBuilder.groovy
+++ b/.test-infra/jenkins/NexmarkBuilder.groovy
@@ -63,6 +63,16 @@ class NexmarkBuilder {
suite(context, "NEXMARK IN ZETASQL STREAMING MODE USING ${runner} RUNNER",
runner, sdk, options, jobSpecificSwitches, javaRuntimeVersion)
}
+ static void nonQueryLanguageJobs(context, Runner runner, SDK sdk,
Map<String, Object> jobSpecificOptions, TriggeringContext triggeringContext,
List<String> jobSpecificSwitches, String javaRuntimeVersion) {
+ Map<String, Object> options = getFullOptions(jobSpecificOptions, runner,
triggeringContext)
+
+ options.put('streaming', false)
+ suite(context, "NEXMARK IN BATCH MODE USING ${runner} RUNNER", runner,
sdk, options, jobSpecificSwitches, javaRuntimeVersion)
+
+ options.put('streaming', true)
+ suite(context, "NEXMARK IN STREAMING MODE USING ${runner} RUNNER", runner,
sdk, options, jobSpecificSwitches, javaRuntimeVersion)
+ }
+
static void batchOnlyJob(context, Runner runner, SDK sdk, Map<String,
Object> jobSpecificOptions, TriggeringContext triggeringContext) {
Map<String, Object> options = getFullOptions(jobSpecificOptions, runner,
triggeringContext)
@@ -122,8 +132,10 @@ class NexmarkBuilder {
// Run with Java 11
gradle {
rootBuildScriptDir(commonJobProperties.checkoutDir)
- tasks(':sdks:java:testing:nexmark:runJava11')
+ tasks(':sdks:java:testing:nexmark:run')
commonJobProperties.setGradleSwitches(delegate)
+ switches("-PcompileAndRunTestsWithJava11")
+ switches("-Pjava11Home=${commonJobProperties.JAVA_11_HOME}")
switches("-Pnexmark.runner=${runner.getDependencyBySDK(sdk)}")
switches("-Pnexmark.args=\"${parseOptions(options)}\"")
if (jobSpecificSwitches != null) {
diff --git a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2.groovy
b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2.groovy
index d39ab69..9d7a124 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2.groovy
@@ -53,7 +53,7 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
// Set common parameters.
commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
- Nexmark.standardJob(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.POST_COMMIT, JOB_SPECIFIC_SWITCHES,
Nexmark.DEFAULT_JAVA_RUNTIME_VERSION)
+ Nexmark.nonQueryLanguageJobs(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.POST_COMMIT, JOB_SPECIFIC_SWITCHES,
Nexmark.DEFAULT_JAVA_RUNTIME_VERSION)
}
PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_DataflowV2',
@@ -63,5 +63,5 @@
PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Da
commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
- Nexmark.standardJob(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.PR, JOB_SPECIFIC_SWITCHES,
Nexmark.DEFAULT_JAVA_RUNTIME_VERSION)
+ Nexmark.nonQueryLanguageJobs(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.PR, JOB_SPECIFIC_SWITCHES,
Nexmark.DEFAULT_JAVA_RUNTIME_VERSION)
}
diff --git
a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2_Java11.groovy
b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2_Java11.groovy
index 1c5c380..8fc69a7 100644
--- a/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2_Java11.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Java_Nexmark_Dataflow_V2_Java11.groovy
@@ -53,7 +53,7 @@
NoPhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_
// Set common parameters.
commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
- Nexmark.standardJob(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.POST_COMMIT, JOB_SPECIFIC_SWITCHES,
Nexmark.JAVA_11_RUNTIME_VERSION)
+ Nexmark.nonQueryLanguageJobs(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.POST_COMMIT, JOB_SPECIFIC_SWITCHES,
Nexmark.JAVA_11_RUNTIME_VERSION)
}
PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_DataflowV2_Java11',
@@ -63,5 +63,5 @@
PhraseTriggeringPostCommitBuilder.postCommitJob('beam_PostCommit_Java_Nexmark_Da
commonJobProperties.setTopLevelMainJobProperties(delegate, 'master', 240)
- Nexmark.standardJob(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.PR, JOB_SPECIFIC_SWITCHES,
Nexmark.JAVA_11_RUNTIME_VERSION)
+ Nexmark.nonQueryLanguageJobs(delegate, Runner.DATAFLOW, SDK.JAVA,
JOB_SPECIFIC_OPTIONS, TriggeringContext.PR, JOB_SPECIFIC_SWITCHES,
Nexmark.JAVA_11_RUNTIME_VERSION)
}
diff --git a/sdks/java/testing/nexmark/build.gradle
b/sdks/java/testing/nexmark/build.gradle
index c831dbc..3345b2d 100644
--- a/sdks/java/testing/nexmark/build.gradle
+++ b/sdks/java/testing/nexmark/build.gradle
@@ -165,31 +165,4 @@ task run(type: JavaExec) {
main = "org.apache.beam.sdk.nexmark.Main"
classpath = configurations.gradleRun
args nexmarkArgsList.toArray()
-}
-
-// Execute the Nexmark queries or suites via Gradle using Java 11.
-task runJava11(type: JavaExec) {
- def nexmarkArgsList = getNexmarkArgs()
- if (isDataflowRunner) {
- if (isDataflowRunnerV2) {
- dependsOn
":runners:google-cloud-dataflow-java:buildAndPushDockerContainer"
- finalizedBy ":runners:google-cloud-dataflow-java:cleanUpDockerImages"
- } else {
- dependsOn
":runners:google-cloud-dataflow-java:worker:legacy-worker:shadowJar"
- }
- }
- javaLauncher = javaToolchains.launcherFor {
- languageVersion = JavaLanguageVersion.of(11)
- }
- main = "org.apache.beam.sdk.nexmark.Main"
- classpath = configurations.gradleRun
- args nexmarkArgsList.toArray()
-}
-
-if (!project.hasProperty("compileAndRunTestsWithJava11")) {
- tasks.withType(JavaCompile).configureEach {
- javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(8)
- }
- }
}
\ No newline at end of file
