Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E4ABF200CBB for ; Mon, 19 Jun 2017 23:22:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E35A6160BCD; Mon, 19 Jun 2017 21:22:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 33979160BF1 for ; Mon, 19 Jun 2017 23:22:56 +0200 (CEST) Received: (qmail 25401 invoked by uid 500); 19 Jun 2017 21:22:55 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 25221 invoked by uid 99); 19 Jun 2017 21:22:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2017 21:22:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 77B46E027A; Mon, 19 Jun 2017 21:22:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jensdeppe@apache.org To: commits@geode.apache.org Date: Mon, 19 Jun 2017 21:22:57 -0000 Message-Id: <0b6b19902c324018b25b95be4a5f6b20@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] geode git commit: GEODE-3071: Pull config of docker volumes into top level script so that they can be overridden archived-at: Mon, 19 Jun 2017 21:22:57 -0000 GEODE-3071: Pull config of docker volumes into top level script so that they can be overridden Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/07e8986e Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/07e8986e Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/07e8986e Branch: refs/heads/develop Commit: 07e8986e3deb722c0beea380eac00a18c86844aa Parents: b26fa51 Author: Jens Deppe Authored: Mon Jun 19 07:42:57 2017 -0700 Committer: Jens Deppe Committed: Mon Jun 19 07:48:27 2017 -0700 ---------------------------------------------------------------------- build.gradle | 5 +++++ gradle/docker.gradle | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/07e8986e/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 57372b3..4feb879 100755 --- a/build.gradle +++ b/build.gradle @@ -74,6 +74,11 @@ if (name == 'geode') { ext.scriptDir = 'gradle' } +if (project.hasProperty('parallelDunit')) { + def pwd = System.getenv('PWD') + ext.dunitDockerVolumes = ["${pwd}":pwd] +} + apply from: "${scriptDir}/utilities.gradle" apply from: "${scriptDir}/java.gradle" apply from: "${scriptDir}/dependency-resolution.gradle" http://git-wip-us.apache.org/repos/asf/geode/blob/07e8986e/gradle/docker.gradle ---------------------------------------------------------------------- diff --git a/gradle/docker.gradle b/gradle/docker.gradle index b67c073..7971974 100644 --- a/gradle/docker.gradle +++ b/gradle/docker.gradle @@ -47,11 +47,11 @@ def dockerConfig = { // volumes mounted to the containers // in a form: host_dir : container_dir - def pwd = System.getenv('PWD') def gradleHome = System.getenv('GRADLE_USER_HOME') ?: "${System.getenv('HOME')}/.gradle" volumes = ["${gradleHome}":gradleHome] - volumes << ["${pwd}":pwd] + // Add volumes configured by top-level build script + volumes << project.dunitDockerVolumes // specify the user for starting Gradle test worker within the container. user = dunitDockerUser