You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/12/08 04:21:55 UTC
bigtop git commit: BIGTOP-1541. Support Debian jessie in Bigtop
Repository: bigtop
Updated Branches:
refs/heads/master 82922353d -> 977d7ac04
BIGTOP-1541. Support Debian jessie in Bigtop
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/977d7ac0
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/977d7ac0
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/977d7ac0
Branch: refs/heads/master
Commit: 977d7ac04b14c61177f5b87987fce721be95a63a
Parents: 8292235
Author: Olaf Flebbe <o....@science-computing.de>
Authored: Mon Dec 1 10:51:54 2014 +0100
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Sun Dec 7 19:18:25 2014 -0800
----------------------------------------------------------------------
bigtop_toolchain/manifests/cleanup.pp | 2 +-
bigtop_toolchain/manifests/deps.pp | 18 ----------------
bigtop_toolchain/manifests/env.pp | 11 +++++++++-
bigtop_toolchain/manifests/gradle.pp | 4 ++--
bigtop_toolchain/manifests/installer.pp | 1 -
bigtop_toolchain/manifests/jdk.pp | 10 +++++++++
bigtop_toolchain/manifests/packages.pp | 10 ++++-----
bigtop_toolchain/manifests/protobuf.pp | 20 +++++++++++++----
bigtop_toolchain/manifests/scala.pp | 32 +++++++++++++++++-----------
9 files changed, 64 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/cleanup.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/cleanup.pp b/bigtop_toolchain/manifests/cleanup.pp
index 412d69a..0c742c5 100644
--- a/bigtop_toolchain/manifests/cleanup.pp
+++ b/bigtop_toolchain/manifests/cleanup.pp
@@ -17,7 +17,7 @@ class bigtop_toolchain::cleanup {
$packager_cleanup = $operatingsystem ? {
/(?i:(centos|fedora|amazon))/ => 'yum clean all',
/(?i:(SLES|opensuse))/ => 'zypper clean -a',
- Ubuntu => 'apt-get clean',
+ /Ubuntu|Debian/ => 'apt-get clean',
}
exec { 'remove archives':
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/deps.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
index a23fa49..6e5e72b 100644
--- a/bigtop_toolchain/manifests/deps.pp
+++ b/bigtop_toolchain/manifests/deps.pp
@@ -41,22 +41,4 @@ class bigtop_toolchain::deps {
require => Package[$packages::pkgs],
unless => "/usr/bin/test -f /usr/src/gradle-2.0-bin.zip",
}
-
- exec { '/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/libprotobuf8_2.5.0-9ubuntu1_amd64.deb':
- cwd => "/usr/src",
- require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/libprotobuf8_2.5.0-9ubuntu1_amd64.deb",
- }
-
- exec { '/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/libprotoc8_2.5.0-9ubuntu1_amd64.deb':
- cwd => "/usr/src",
- require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/libprotoc8_2.5.0-9ubuntu1_amd64.deb",
- }
-
- exec { '/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/protobuf-compiler_2.5.0-9ubuntu1_amd64.deb':
- cwd => "/usr/src",
- require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/protobuf-compiler_2.5.0-9ubuntu1_amd64.deb",
- }
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/env.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp
index 61af2a6..656560f 100644
--- a/bigtop_toolchain/manifests/env.pp
+++ b/bigtop_toolchain/manifests/env.pp
@@ -15,7 +15,7 @@
class bigtop_toolchain::env {
case $operatingsystem{
- Ubuntu: {
+ /Ubuntu/: {
file { '/etc/profile.d/bigtop.sh':
source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.ubu',
ensure => present,
@@ -24,6 +24,15 @@ class bigtop_toolchain::env {
mode => 644,
}
}
+ /Debian/: {
+ file { '/etc/profile.d/bigtop.sh':
+ source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.debian',
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ }
+ }
default: {
file {'/etc/profile.d/bigtop.sh':
source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.centos',
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/gradle.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/gradle.pp b/bigtop_toolchain/manifests/gradle.pp
index a59e2b0..16021f8 100644
--- a/bigtop_toolchain/manifests/gradle.pp
+++ b/bigtop_toolchain/manifests/gradle.pp
@@ -17,7 +17,7 @@ class bigtop_toolchain::gradle {
include bigtop_toolchain::deps
- exec {'/usr/bin/unzip -x /usr/src/gradle-2.0-bin.zip':
+ exec {'/usr/bin/unzip -x -o /usr/src/gradle-2.0-bin.zip':
cwd => '/usr/local',
refreshonly => true,
subscribe => Exec["/usr/bin/wget http://services.gradle.org/distributions/gradle-2.0-bin.zip"],
@@ -27,6 +27,6 @@ class bigtop_toolchain::gradle {
file {'/usr/local/gradle':
ensure => link,
target => '/usr/local/gradle-2.0',
- require => Exec['/usr/bin/unzip -x /usr/src/gradle-2.0-bin.zip'],
+ require => Exec['/usr/bin/unzip -x -o /usr/src/gradle-2.0-bin.zip'],
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/installer.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/installer.pp b/bigtop_toolchain/manifests/installer.pp
index 8b1e992..6dd436a 100644
--- a/bigtop_toolchain/manifests/installer.pp
+++ b/bigtop_toolchain/manifests/installer.pp
@@ -15,7 +15,6 @@
class bigtop_toolchain::installer {
include bigtop_toolchain::jdk
-# include bigtop_toolchain::jdk6
include bigtop_toolchain::maven
include bigtop_toolchain::forrest
include bigtop_toolchain::ant
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/jdk.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp
index 50a2b7e..c1c05f6 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -14,6 +14,14 @@
# limitations under the License.
class bigtop_toolchain::jdk {
+
+ case $operatingsystem{
+ Debian: {
+ package { 'openjdk-7-jdk' :
+ ensure => present
+ }
+ }
+ default : {
file { '/tmp/jdk-7u60-linux-x64.gz':
source => 'puppet:///modules/bigtop_toolchain/jdk-7u60-linux-x64.gz',
ensure => present,
@@ -27,4 +35,6 @@ class bigtop_toolchain::jdk {
refreshonly => true,
subscribe => File["/tmp/jdk-7u60-linux-x64.gz"],
}
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index ebd14a0..5042b81 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -18,14 +18,14 @@ class bigtop_toolchain::packages {
/(?i:(centos|fedora))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "cppunit-devel", "openssl-devel", "rpm-build" , "redhat-rpm-config", "fuse-libs" ] }
/(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "libcppunit-devel", "libopenssl-devel", "rpm-devel", "pkg-config" ] }
Amazon: { $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", "fuse-devel", "openssl-devel", "rpm-build" , "system-rpm-config", "fuse-libs" ] }
- Ubuntu: { $pkgs = [ "unzip", "curl", "wget", "git-core", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "g++", "fuse", "reprepro", "liblzo2-dev", "libfuse-dev", "libcppunit-dev", "libssl-dev", "libzip-dev", "sharutils", "pkg-config", "debhelper", "devscripts", "protobuf-compiler", "build-essential", "dh-make", "libfuse2", "libssh-dev", "libjansi-java" ]
+ /(Ubuntu|Debian)/: { $pkgs = [ "unzip", "curl", "wget", "git-core", "make", "cmake", "autoconf", "automake", "libtool", "gcc", "g++", "fuse", "reprepro", "liblzo2-dev", "libfuse-dev", "libcppunit-dev", "libssl-dev", "libzip-dev", "sharutils", "pkg-config", "debhelper", "devscripts", "build-essential", "dh-make", "libfuse2", "libssh-dev", "libjansi-java" ]
- exec { "apt-update":
- command => "/usr/bin/apt-get update"
+ exec { "apt-update":
+ command => "/usr/bin/apt-get update"
+ }
+ Exec["apt-update"] -> Package <| |>
}
- Exec["apt-update"] -> Package <| |>
}
-}
package { $pkgs:
ensure => installed,
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/protobuf.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/protobuf.pp b/bigtop_toolchain/manifests/protobuf.pp
index ddff627..e69d909 100644
--- a/bigtop_toolchain/manifests/protobuf.pp
+++ b/bigtop_toolchain/manifests/protobuf.pp
@@ -18,25 +18,37 @@ class bigtop_toolchain::protobuf {
include bigtop_toolchain::deps
case $operatingsystem{
- Ubuntu: {
+ /Ubuntu|Debian/: {
+ exec { '/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/libprotobuf8_2.5.0-9ubuntu1_amd64.deb':
+ cwd => "/usr/src",
+ require => Package[$packages::pkgs],
+ unless => "/usr/bin/test -f /usr/src/libprotobuf8_2.5.0-9ubuntu1_amd64.deb",
+ }
+ exec { '/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/libprotoc8_2.5.0-9ubuntu1_amd64.deb':
+ cwd => "/usr/src",
+ require => Package[$packages::pkgs],
+ unless => "/usr/bin/test -f /usr/src/libprotoc8_2.5.0-9ubuntu1_amd64.deb",
+ }
+ exec { '/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/protobuf-compiler_2.5.0-9ubuntu1_amd64.deb':
+ cwd => "/usr/src",
+ require => Package[$packages::pkgs],
+ unless => "/usr/bin/test -f /usr/src/protobuf-compiler_2.5.0-9ubuntu1_amd64.deb",
+ }
exec {'/usr/bin/dpkg -i protobuf-compiler_2.5.0-9ubuntu1_amd64.deb':
unless => "/usr/bin/test -f /usr/bin/protoc",
cwd => "/usr/src",
require => [ EXEC["/usr/bin/dpkg -i libprotoc8_2.5.0-9ubuntu1_amd64.deb"],EXEC["/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/protobuf-compiler_2.5.0-9ubuntu1_amd64.deb"] ]
}
-
exec {'/usr/bin/dpkg -i libprotoc8_2.5.0-9ubuntu1_amd64.deb':
unless => "/usr/bin/test -f /usr/bin/protoc",
cwd => "/usr/src",
require => [ EXEC["/usr/bin/dpkg -i libprotobuf8_2.5.0-9ubuntu1_amd64.deb"],EXEC["/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/libprotoc8_2.5.0-9ubuntu1_amd64.deb"] ]
}
-
exec {'/usr/bin/dpkg -i libprotobuf8_2.5.0-9ubuntu1_amd64.deb':
unless => "/usr/bin/test -f /usr/bin/protoc",
cwd => "/usr/src",
require => EXEC["/usr/bin/wget https://launchpad.net/ubuntu/+archive/primary/+files/libprotobuf8_2.5.0-9ubuntu1_amd64.deb"],
}
-
}
default: {
case $operatingsystem {
http://git-wip-us.apache.org/repos/asf/bigtop/blob/977d7ac0/bigtop_toolchain/manifests/scala.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/scala.pp b/bigtop_toolchain/manifests/scala.pp
index 5fc5930..60868f1 100644
--- a/bigtop_toolchain/manifests/scala.pp
+++ b/bigtop_toolchain/manifests/scala.pp
@@ -13,17 +13,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
class bigtop_toolchain::scala {
-
- $install_scala_cmd = $operatingsystem ? {
- 'Ubuntu' => '/bin/bash -c "wget http://www.scala-lang.org/files/archive/scala-2.10.3.deb ; dpkg -x ./scala-2.10.3.deb /"',
- /(?i:(SLES|opensuse))/ => '/usr/bin/zypper install -y http://www.scala-lang.org/files/archive/scala-2.10.3.rpm',
- default => '/bin/rpm -U http://www.scala-lang.org/files/archive/scala-2.10.3.rpm'
- }
-
- exec { "install scala":
- cwd => '/tmp',
- command => $install_scala_cmd,
- unless => "/usr/bin/test -f /usr/bin/scala",
- require => $requires
+
+ case $operatingsystem{
+ Debian: {
+ package { 'scala' :
+ ensure => present
+ }
+ }
+ default: {
+ $install_scala_cmd = $operatingsystem ? {
+ 'Ubuntu' => '/bin/bash -c "wget http://www.scala-lang.org/files/archive/scala-2.10.3.deb ; dpkg -x ./scala-2.10.3.deb /"',
+ /(?i:(SLES|opensuse))/ => '/usr/bin/zypper install -y http://www.scala-lang.org/files/archive/scala-2.10.3.rpm',
+ default => '/bin/rpm -U http://www.scala-lang.org/files/archive/scala-2.10.3.rpm'
+ }
+ exec { "install scala":
+ cwd => '/tmp',
+ command => $install_scala_cmd,
+ unless => "/usr/bin/test -f /usr/bin/scala",
+ require => $requires
+ }
+ }
}
}