You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/11/20 17:15:50 UTC
[4/6] beam git commit: Simplify maintainability by generating tasks
and command line from list of root Java projects
Simplify maintainability by generating tasks and command line from list of root Java projects
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/fc74b8a4
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/fc74b8a4
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/fc74b8a4
Branch: refs/heads/master
Commit: fc74b8a4eb7462b60d6a54a721cf0b9a48a68547
Parents: b190916
Author: Luke Cwik <lc...@google.com>
Authored: Fri Nov 17 16:30:59 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Sun Nov 19 10:27:39 2017 -0800
----------------------------------------------------------------------
.../job_beam_PreCommit_Java_GradleBuild.groovy | 32 +++++++++++++-------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/fc74b8a4/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
index 527fb32..40f64d1 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
@@ -32,21 +32,31 @@ job('beam_PreCommit_Java_GradleBuild') {
'master',
240)
+ def root_projects = [
+ ':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core',
+ ':beam-runners-parent:beam-runners-direct-java',
+ ':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-fn-execution',
+ ]
+ def gradle_switches = [
+ // Continue the build even if there is a failure to show as many potential failures as possible.
+ '--continue',
+ // Until we verify the build cache is working appropriately, force rerunning all tasks
+ '--rerun-tasks',
+ ]
+
+ def gradle_command_line = './gradlew ' + gradle_switches.join(' ') + ' ' + root_projects.join(':buildNeeded ') + ' ' + root_projects.join(':buildDependents ')
// Sets that this is a PreCommit job.
- common_job_properties.setPreCommit(delegate, './gradlew --continue --rerun-tasks :beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core:buildDependents :beam-runners-parent:beam-runners-direct-java:buildDependents :beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-fn-execution:buildDependents :beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core:buildNeeded :beam-runners-parent:beam-runners-direct-java:buildNeeded :beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-fn-execution:buildNeeded', 'Run Java Gradle PreCommit')
+ common_job_properties.setPreCommit(delegate, gradle_command_line, 'Run Java Gradle PreCommit')
steps {
gradle {
- tasks(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core:buildNeeded')
- tasks(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core:buildDependents')
- tasks(':beam-runners-parent:beam-runners-direct-java:buildNeeded')
- tasks(':beam-runners-parent:beam-runners-direct-java:buildDependents')
- tasks(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-fn-execution:buildNeeded')
- tasks(':beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-fn-execution:buildDependents')
- // Continue the build even if there is a failure to show as many potential failures as possible.
- switches('--continue')
- // Until we verify the build cache is working appropriately, force rerunning all tasks
- switches('--rerun-tasks')
+ for (String root_project : root_projects) {
+ tasks(root_project + ':buildNeeded')
+ tasks(root_project + ':buildDependents')
+ }
+ for (String gradle_switch : gradle_switches) {
+ switches(gradle_switch)
+ }
}
}
}