Repository: beam
Updated Branches:
  refs/heads/master 022e74460 -> 6fe6bc7eb


Revert PR/3976, the Jenkins Gradle plugin expects the Gradle Wrapper to be in 
the root of the directory.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/af9bfe57
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/af9bfe57
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/af9bfe57

Branch: refs/heads/master
Commit: af9bfe57250c24c55a70de3fea7fff00e46ae351
Parents: 9bd9c85
Author: Luke Cwik <[email protected]>
Authored: Sat Nov 18 08:45:05 2017 -0800
Committer: Luke Cwik <[email protected]>
Committed: Sun Nov 19 10:27:39 2017 -0800

----------------------------------------------------------------------
 .test-infra/jenkins/common_job_properties.groovy | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/af9bfe57/.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 3b0776b..68409c0 100644
--- a/.test-infra/jenkins/common_job_properties.groovy
+++ b/.test-infra/jenkins/common_job_properties.groovy
@@ -22,8 +22,6 @@
 //  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 {
@@ -38,7 +36,6 @@ class common_job_properties {
         branch('${sha1}')
         extensions {
           cleanAfterCheckout()
-          relativeTargetDirectory(checkoutDir)
         }
       }
     }
@@ -174,7 +171,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(checkoutDir + '/pom.xml')
+    context.rootPOM('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.

Reply via email to