aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-04-13 22:01:53 +0200
committerOlaf Flebbe <of@oflebbe.de>2015-04-19 23:14:30 +0200
commit527af71bc7691ad4d6707cb287662cbab6eb3ade (patch)
tree37e2c7a12a661c5769a8ecf038fd1e308c926707 /bigtop_toolchain
parentd010ee383d49548080ec03b3c1935c334c154a76 (diff)
downloadbigtop-odpi-527af71bc7691ad4d6707cb287662cbab6eb3ade.tar.gz
BIGTOP-1830: Move apache-forrest installation from bigtop_toolchain to pig compile
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/README.md4
-rw-r--r--bigtop_toolchain/files/jenkins.sh.centos1
-rw-r--r--bigtop_toolchain/files/jenkins.sh.debian1
-rw-r--r--bigtop_toolchain/manifests/deps.pp6
-rw-r--r--bigtop_toolchain/manifests/forrest.pp48
-rw-r--r--bigtop_toolchain/manifests/installer.pp1
6 files changed, 0 insertions, 61 deletions
diff --git a/bigtop_toolchain/README.md b/bigtop_toolchain/README.md
index f49cf992..d8c2c7f9 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
diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos
index 82034e2a..c168876c 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
diff --git a/bigtop_toolchain/files/jenkins.sh.debian b/bigtop_toolchain/files/jenkins.sh.debian
index 6c1af95e..ccb31d75 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
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
index 6e5e72bd..585cdfd1 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],
diff --git a/bigtop_toolchain/manifests/forrest.pp b/bigtop_toolchain/manifests/forrest.pp
deleted file mode 100644
index b0c87f06..00000000
--- 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,
- }
-}
diff --git a/bigtop_toolchain/manifests/installer.pp b/bigtop_toolchain/manifests/installer.pp
index 6dd436a5..94783990 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