Repository: bigtop Updated Branches: refs/heads/master d010ee383 -> 527af71bc
BIGTOP-1830: Move apache-forrest installation from bigtop_toolchain to pig compile Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/527af71b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/527af71b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/527af71b Branch: refs/heads/master Commit: 527af71bc7691ad4d6707cb287662cbab6eb3ade Parents: d010ee3 Author: Olaf Flebbe <o...@oflebbe.de> Authored: Mon Apr 13 22:01:53 2015 +0200 Committer: Olaf Flebbe <o...@oflebbe.de> Committed: Sun Apr 19 23:14:30 2015 +0200 ---------------------------------------------------------------------- .../src/common/pig/do-component-build | 13 ++++++ bigtop_toolchain/README.md | 4 -- bigtop_toolchain/files/jenkins.sh.centos | 1 - bigtop_toolchain/files/jenkins.sh.debian | 1 - bigtop_toolchain/manifests/deps.pp | 6 --- bigtop_toolchain/manifests/forrest.pp | 48 -------------------- bigtop_toolchain/manifests/installer.pp | 1 - 7 files changed, 13 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop-packages/src/common/pig/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/pig/do-component-build b/bigtop-packages/src/common/pig/do-component-build index eaab447..350a0fa 100644 --- a/bigtop-packages/src/common/pig/do-component-build +++ b/bigtop-packages/src/common/pig/do-component-build @@ -28,6 +28,19 @@ hadoop-hdfs.version=$HADOOP_VERSION hadoop-mapreduce.version=$HADOOP_VERSION __EOT__ +# use .m2/repository/apache-forrest as store for apache forrest depency download store +# since -O and -N cannot be used together, work around this issue +( mkdir -p $HOME/.m2/repository/apache-forrest ; + cd $HOME/.m2/repository/apache-forrest ; + /usr/bin/wget -N https://archive.apache.org/dist/forrest/0.9/apache-forrest-0.9.tar.gz + echo "ea58a078e3861d4dfc8bf3296a53a5f8 apache-forrest-0.9.tar.gz" >apache-forrest-0.9.tar.md5 + if ! md5sum -c --quiet apache-forrest-0.9.tar.md5 ; then + exit 1 + fi +) +tar xf $HOME/.m2/repository/apache-forrest/apache-forrest-0.9.tar.gz +export FORREST_HOME=`pwd`/apache-forrest-0.9 + BUILD_OPTS="-Djavac.version=${JDK_VERSION} -Dforrest.home=${FORREST_HOME} -Dversion=${PIG_VERSION} -Dhadoopversion=23" # FIXME: there's a weird synchronization issue between ivy and Maven caches wrt. jetty http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop_toolchain/README.md ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/README.md b/bigtop_toolchain/README.md index f49cf99..d8c2c7f 100644 --- a/bigtop_toolchain/README.md +++ b/bigtop_toolchain/README.md @@ -22,8 +22,6 @@ Puppet module for configuring a host for building BigTop. It installs: **Apache Ant 1.9.4** -**Apache Forrest 0.9** - **OpenJDK 1.7** **Apache Maven 3.0.5** @@ -42,7 +40,6 @@ These can be indivdually applied using: node "node1.example.com" { include bigtop_toolchain::jdk include bigtop_toolchain::maven - include bigtop_toolchain::forrest include bigtop_toolchain::ant include bigtop_toolchain::gradle include bigtop_toolchain::protobuf @@ -63,7 +60,6 @@ building BigTop: MAVEN_HOME=/usr/local/maven JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk.x86_64 ANT_HOME=/usr/local/ant -FORREST_HOME=/usr/local/apache-forrest SCALA_HOME=/usr/share/java GRADLE_HOME=/usr/local/gradle PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop_toolchain/files/jenkins.sh.centos ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos index 82034e2..c168876 100644 --- a/bigtop_toolchain/files/jenkins.sh.centos +++ b/bigtop_toolchain/files/jenkins.sh.centos @@ -16,7 +16,6 @@ export MAVEN_HOME=/usr/local/maven export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk.x86_64 export ANT_HOME=/usr/local/ant -export FORREST_HOME=/usr/local/apache-forrest export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop_toolchain/files/jenkins.sh.debian ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.debian b/bigtop_toolchain/files/jenkins.sh.debian index 6c1af95..ccb31d7 100644 --- a/bigtop_toolchain/files/jenkins.sh.debian +++ b/bigtop_toolchain/files/jenkins.sh.debian @@ -16,7 +16,6 @@ export MAVEN_HOME=/usr/local/maven export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64 export ANT_HOME=/usr/local/ant -export FORREST_HOME=/usr/local/apache-forrest export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop_toolchain/manifests/deps.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp index 6e5e72b..585cdfd 100644 --- a/bigtop_toolchain/manifests/deps.pp +++ b/bigtop_toolchain/manifests/deps.pp @@ -24,12 +24,6 @@ class bigtop_toolchain::deps { unless => "/usr/bin/test -f /usr/src/apache-ant-1.9.4-bin.tar.gz", } - exec {"/usr/bin/wget http://archive.apache.org/dist/forrest/0.9/apache-forrest-0.9.tar.gz": - cwd => "/usr/src", - require => Package[$packages::pkgs], - unless => "/usr/bin/test -f /usr/src/apache-forrest-0.9.tar.gz", - } - exec {"/usr/bin/wget $apache_prefix/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz": cwd => "/usr/src", require => Package[$packages::pkgs], http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop_toolchain/manifests/forrest.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/forrest.pp b/bigtop_toolchain/manifests/forrest.pp deleted file mode 100644 index b0c87f0..0000000 --- a/bigtop_toolchain/manifests/forrest.pp +++ /dev/null @@ -1,48 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -class bigtop_toolchain::forrest { - - include bigtop_toolchain::deps - - 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 => 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 /usr/src/apache-forrest-0.9.tar.gz'], - } - # BIGTOP-1596 - file { '/usr/local/apache-forrest/build': - ensure => 'directory', - mode => '0777', - recurse => true, - } - file { '/usr/local/apache-forrest/main': - ensure => 'directory', - mode => '0777', - recurse => true, - } - file { '/usr/local/apache-forrest/plugins': - ensure => 'directory', - mode => '0777', - recurse => true, - } -} http://git-wip-us.apache.org/repos/asf/bigtop/blob/527af71b/bigtop_toolchain/manifests/installer.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/installer.pp b/bigtop_toolchain/manifests/installer.pp index 6dd436a..9478399 100644 --- a/bigtop_toolchain/manifests/installer.pp +++ b/bigtop_toolchain/manifests/installer.pp @@ -16,7 +16,6 @@ class bigtop_toolchain::installer { include bigtop_toolchain::jdk include bigtop_toolchain::maven - include bigtop_toolchain::forrest include bigtop_toolchain::ant include bigtop_toolchain::gradle include bigtop_toolchain::protobuf