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 23:15:07 UTC
[2/3] beam git commit: Re-apply PR/3976 and disable the Jenkins
Gradle build to fix the other precommits.
Re-apply PR/3976 and disable the Jenkins Gradle build to fix the other precommits.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/905facbb
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/905facbb
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/905facbb
Branch: refs/heads/master
Commit: 905facbb48e3e9fc4f4e48fbf65fd78474256185
Parents: ad3a5a9
Author: Luke Cwik <lc...@google.com>
Authored: Mon Nov 20 13:56:29 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Mon Nov 20 15:14:38 2017 -0800
----------------------------------------------------------------------
.test-infra/jenkins/common_job_properties.groovy | 5 ++++-
.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/905facbb/.test-infra/jenkins/common_job_properties.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/common_job_properties.groovy b/.test-infra/jenkins/common_job_properties.groovy
index 68409c0..3b0776b 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -22,6 +22,8 @@
// http://groovy-lang.org/style-guide.html
class common_job_properties {
+ static String checkoutDir = 'src'
+
static void setSCM(def context, String repositoryName) {
context.scm {
git {
@@ -36,6 +38,7 @@ class common_job_properties {
branch('${sha1}')
extensions {
cleanAfterCheckout()
+ relativeTargetDirectory(checkoutDir)
}
}
}
@@ -171,7 +174,7 @@ class common_job_properties {
// tiered compilation to make the JVM startup times faster during the tests.
context.mavenOpts('-XX:+TieredCompilation')
context.mavenOpts('-XX:TieredStopAtLevel=1')
- context.rootPOM('pom.xml')
+ context.rootPOM(checkoutDir + '/pom.xml')
// Use a repository local to the workspace for better isolation of jobs.
context.localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE)
// Disable archiving the built artifacts by default, as this is slow and flaky.
http://git-wip-us.apache.org/repos/asf/beam/blob/905facbb/.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 40f64d1..2dc8ae9 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_GradleBuild.groovy
@@ -23,6 +23,10 @@ import common_job_properties
job('beam_PreCommit_Java_GradleBuild') {
description('Runs a build of the current GitHub Pull Request.')
+ // TODO: Re-enable once gradle can find the wrapper script within
+ // the relative checkout directory.
+ disabled()
+
// Execute concurrent builds if necessary.
concurrentBuild()