Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 141CF10175 for ; Mon, 26 Aug 2013 19:48:25 +0000 (UTC) Received: (qmail 93841 invoked by uid 500); 26 Aug 2013 19:48:24 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 93486 invoked by uid 500); 26 Aug 2013 19:48:21 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 93477 invoked by uid 99); 26 Aug 2013 19:48:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 19:48:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7E56F8C5B60; Mon, 26 Aug 2013 19:48:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cos@apache.org To: commits@bigtop.apache.org Message-Id: <0d450425024c416d9003746006cd8174@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: BIGTOP-932. Allow puppet recipes to automatically pull in needed files from web Date: Mon, 26 Aug 2013 19:48:19 +0000 (UTC) Updated Branches: refs/heads/master 07758fc0b -> 85d1353ca BIGTOP-932. Allow puppet recipes to automatically pull in needed files from web Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/85d1353c Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/85d1353c Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/85d1353c Branch: refs/heads/master Commit: 85d1353ca8f46faca6ad26bc2cd12bf953b08444 Parents: 07758fc Author: Ian Mordey Authored: Mon Aug 26 12:45:37 2013 -0700 Committer: Konstantin Boudnik Committed: Mon Aug 26 12:46:02 2013 -0700 ---------------------------------------------------------------------- bigtop-toolchain/README.md | 13 +++---------- bigtop-toolchain/manifests/ant.pp | 20 ++++++++------------ bigtop-toolchain/manifests/forrest.pp | 17 ++++++----------- bigtop-toolchain/manifests/jdk.pp | 8 ++++---- bigtop-toolchain/manifests/maven.pp | 20 ++++++++------------ 5 files changed, 29 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/85d1353c/bigtop-toolchain/README.md ---------------------------------------------------------------------- diff --git a/bigtop-toolchain/README.md b/bigtop-toolchain/README.md index 37ffca7..78920c5 100644 --- a/bigtop-toolchain/README.md +++ b/bigtop-toolchain/README.md @@ -22,7 +22,7 @@ Ian Mordey Puppet module for configuring a CentOS host for building BigTop. It installs: -**Apache Ant 1.9.0** +**Apache Ant 1.9.2** **Apache Forrest 0.9** @@ -74,16 +74,9 @@ where is the cloned git repo. Due to redistribution restrictions the Oracle JDK must be downloaded seperately. -Download the JDK 64bit rpm.bin file, run it with the -x switch to extract the rpm file and copy jdk-6u43-linux-amd64.rpm to files/. - -The following files must also be downloaded from their respective mirrors and copied into files/ - -[apache-ant-1.9.0-bin.tar.gz](http://mirrors.ibiblio.org/apache//ant/binaries/apache-ant-1.9.0-bin.tar.gz) - -[apache-forrest-0.9.tar.gz](http://archive.apache.org/dist/forrest/0.9/apache-forrest-0.9.tar.gz) - -[apache-maven-3.0.5-bin.tar.gz](ftp://mirror.reverse.net/pub/apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz) +Download the JDK 64bit rpm.bin file, run it with the -x switch to extract the rpm file and copy jdk-6u45-linux-amd64.rpm to files/. +The Ant/Maven/Forrest sources will be downloaded automatically. If you already have them and do not want to download them again please copy the source .tar.gz files into /usr/src. ## Support http://git-wip-us.apache.org/repos/asf/bigtop/blob/85d1353c/bigtop-toolchain/manifests/ant.pp ---------------------------------------------------------------------- diff --git a/bigtop-toolchain/manifests/ant.pp b/bigtop-toolchain/manifests/ant.pp index 800ca91..01a6175 100644 --- a/bigtop-toolchain/manifests/ant.pp +++ b/bigtop-toolchain/manifests/ant.pp @@ -14,23 +14,19 @@ # limitations under the License. class bigtop-toolchain::ant { - file { '/tmp/apache-ant-1.9.0-bin.tar.gz': - source => 'puppet:///modules/bigtop-toolchain/apache-ant-1.9.0-bin.tar.gz', - ensure => present, - owner => root, - group => root, - mode => 755 - } - - exec {'/bin/tar xvzf /tmp/apache-ant-1.9.0-bin.tar.gz': + + include bigtop-toolchain::deps + + exec {'/bin/tar xvzf /usr/src/apache-ant-1.9.2-bin.tar.gz': cwd => '/usr/local', refreshonly => true, - subscribe => File["/tmp/apache-ant-1.9.0-bin.tar.gz"], + subscribe => Exec["/usr/bin/wget http://mirrors.ibiblio.org/apache//ant/binaries/apache-ant-1.9.2-bin.tar.gz"], + require => Exec["/usr/bin/wget http://mirrors.ibiblio.org/apache//ant/binaries/apache-ant-1.9.2-bin.tar.gz"], } file {'/usr/local/ant': ensure => link, - target => '/usr/local/apache-ant-1.9.0', - require => Exec['/bin/tar xvzf /tmp/apache-ant-1.9.0-bin.tar.gz'], + target => '/usr/local/apache-ant-1.9.2', + require => Exec['/bin/tar xvzf /usr/src/apache-ant-1.9.2-bin.tar.gz'], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/85d1353c/bigtop-toolchain/manifests/forrest.pp ---------------------------------------------------------------------- diff --git a/bigtop-toolchain/manifests/forrest.pp b/bigtop-toolchain/manifests/forrest.pp index 886f89d..5ff39d5 100644 --- a/bigtop-toolchain/manifests/forrest.pp +++ b/bigtop-toolchain/manifests/forrest.pp @@ -13,25 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -class bigtop-toolchain::forrest{ +class bigtop-toolchain::forrest { - file{ '/tmp/apache-forrest-0.9.tar.gz': - source => 'puppet:///modules/bigtop-toolchain/apache-forrest-0.9.tar.gz', - ensure => present, - owner => root, - group => root, - mode => 755 - } + include bigtop-toolchain::deps - exec{'/bin/tar xvzf /tmp/apache-forrest-0.9.tar.gz': + exec{'/bin/tar xvzf /usr/src/apache-forrest-0.9.tar.gz': cwd => '/usr/local', + require => Exec["/usr/bin/wget http://archive.apache.org/dist/forrest/0.9/apache-forrest-0.9.tar.gz"], refreshonly => true, - subscribe => File["/tmp/apache-forrest-0.9.tar.gz"], + subscribe => Exec["/usr/bin/wget http://archive.apache.org/dist/forrest/0.9/apache-forrest-0.9.tar.gz"], } file { '/usr/local/apache-forrest': ensure => link, target => '/usr/local/apache-forrest-0.9', - require => Exec['/bin/tar xvzf /tmp/apache-forrest-0.9.tar.gz'], + require => Exec['/bin/tar xvzf /usr/src/apache-forrest-0.9.tar.gz'], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/85d1353c/bigtop-toolchain/manifests/jdk.pp ---------------------------------------------------------------------- diff --git a/bigtop-toolchain/manifests/jdk.pp b/bigtop-toolchain/manifests/jdk.pp index a9df961..19e1b9f 100644 --- a/bigtop-toolchain/manifests/jdk.pp +++ b/bigtop-toolchain/manifests/jdk.pp @@ -14,17 +14,17 @@ # limitations under the License. class bigtop-toolchain::jdk { - file { '/tmp/jdk-6u43-linux-amd64.rpm': - source => 'puppet:///modules/bigtop-toolchain/jdk-6u43-linux-amd64.rpm', + file { '/tmp/jdk-6u45-linux-amd64.rpm': + source => 'puppet:///modules/bigtop-toolchain/jdk-6u45-linux-amd64.rpm', ensure => present, owner => root, group => root, mode => 755 } - exec {'/bin/rpm -Uvh /tmp/jdk-6u43-linux-amd64.rpm': + exec {'/bin/rpm -Uvh /tmp/jdk-6u45-linux-amd64.rpm': cwd => '/tmp', refreshonly => true, - subscribe => File["/tmp/jdk-6u43-linux-amd64.rpm"], + subscribe => File["/tmp/jdk-6u45-linux-amd64.rpm"], } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/85d1353c/bigtop-toolchain/manifests/maven.pp ---------------------------------------------------------------------- diff --git a/bigtop-toolchain/manifests/maven.pp b/bigtop-toolchain/manifests/maven.pp index 284d3a1..3f7f4a9 100644 --- a/bigtop-toolchain/manifests/maven.pp +++ b/bigtop-toolchain/manifests/maven.pp @@ -13,24 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -class bigtop-toolchain::maven { - file { '/tmp/apache-maven-3.0.5-bin.tar.gz': - source => 'puppet:///modules/bigtop-toolchain/apache-maven-3.0.5-bin.tar.gz', - ensure => present, - owner => root, - group => root, - mode => 755 - } - - exec {'/bin/tar xvzf /tmp/apache-maven-3.0.5-bin.tar.gz': +class bigtop-toolchain::maven { + + include bigtop-toolchain::deps + + exec {'/bin/tar xvzf /usr/src/apache-maven-3.0.5-bin.tar.gz': cwd => '/usr/local', refreshonly => true, - subscribe => File["/tmp/apache-maven-3.0.5-bin.tar.gz"], + subscribe => Exec["/usr/bin/wget ftp://mirror.reverse.net/pub/apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz"], + require => Exec["/usr/bin/wget ftp://mirror.reverse.net/pub/apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz"], } file {'/usr/local/maven': ensure => link, target => '/usr/local/apache-maven-3.0.5', - require => Exec['/bin/tar xvzf /tmp/apache-maven-3.0.5-bin.tar.gz'], + require => Exec['/bin/tar xvzf /usr/src/apache-maven-3.0.5-bin.tar.gz'], } }