Repository: bigtop Updated Branches: refs/heads/master 23ea10ecc -> 15f4fec4f
BIGTOP-2236. GRADLE_USER_HOME should be set for bigtop/slaves images only Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1610271d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1610271d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1610271d Branch: refs/heads/master Commit: 1610271d5ff344f344bb649bd2a4442b063ae20a Parents: 23ea10e Author: Evans Ye <[email protected]> Authored: Thu Jan 14 01:09:16 2016 +0800 Committer: Evans Ye <[email protected]> Committed: Fri Jan 15 00:02:08 2016 +0800 ---------------------------------------------------------------------- bigtop_toolchain/templates/jenkins.sh | 1 - docker/bigtop-slaves/centos-6/Dockerfile | 2 ++ docker/bigtop-slaves/centos-7/Dockerfile | 2 ++ docker/bigtop-slaves/debian-8/Dockerfile | 2 ++ docker/bigtop-slaves/fedora-20/Dockerfile | 2 ++ docker/bigtop-slaves/opensuse-13.2/Dockerfile | 2 ++ docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile | 3 +++ docker/bigtop-slaves/ubuntu-14.04/Dockerfile | 2 ++ docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/bigtop_toolchain/templates/jenkins.sh ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/templates/jenkins.sh b/bigtop_toolchain/templates/jenkins.sh index ad3d838..31e3ecd 100644 --- a/bigtop_toolchain/templates/jenkins.sh +++ b/bigtop_toolchain/templates/jenkins.sh @@ -20,4 +20,3 @@ export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$GRADLE_HOME/bin:$PATH export GRADLE_OPTS="-Dorg.gradle.daemon=true" -export GRADLE_USER_HOME="/usr/share/gradle.home" http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/centos-6/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile index e76f694..6dfef5d 100644 --- a/docker/bigtop-slaves/centos-6/Dockerfile +++ b/docker/bigtop-slaves/centos-6/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/centos-7/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile index 2f4c0ec..a9888b4 100644 --- a/docker/bigtop-slaves/centos-7/Dockerfile +++ b/docker/bigtop-slaves/centos-7/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/debian-8/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/debian-8/Dockerfile b/docker/bigtop-slaves/debian-8/Dockerfile index 4e22f17..64ce1f9 100644 --- a/docker/bigtop-slaves/debian-8/Dockerfile +++ b/docker/bigtop-slaves/debian-8/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/fedora-20/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile index a59935b..2e5c81d 100644 --- a/docker/bigtop-slaves/fedora-20/Dockerfile +++ b/docker/bigtop-slaves/fedora-20/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/opensuse-13.2/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile index a667c33..f166824 100644 --- a/docker/bigtop-slaves/opensuse-13.2/Dockerfile +++ b/docker/bigtop-slaves/opensuse-13.2/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile index b41da8d..6cd6523 100755 --- a/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile +++ b/docker/bigtop-slaves/ubuntu-14.04-ppc64le/Dockerfile @@ -19,3 +19,6 @@ COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" +RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/ubuntu-14.04/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile index 3ee975a..d71bbab 100644 --- a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile +++ b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home http://git-wip-us.apache.org/repos/asf/bigtop/blob/1610271d/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile index 1ec2769..d5a4b0f 100644 --- a/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile +++ b/docker/bigtop-slaves/ubuntu-15.04-ppc64le/Dockerfile @@ -20,3 +20,5 @@ COPY gradle.home /usr/share/gradle.home RUN puppet apply -e "include bigtop_toolchain::installer" RUN chown jenkins:jenkins /usr/share/gradle.home + +ENV GRADLE_USER_HOME=/usr/share/gradle.home
