Repository: bigtop
Updated Branches:
  refs/heads/master c753d985f -> 362ca725e


BIGTOP-1907. OpenSuSE toolchain updates for 1.0 release


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/362ca725
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/362ca725
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/362ca725

Branch: refs/heads/master
Commit: 362ca725ede548f30cac927efc47464030d06e4c
Parents: c753d98
Author: Evans Ye <evan...@apache.org>
Authored: Fri Jun 19 20:07:39 2015 +0000
Committer: Evans Ye <evan...@apache.org>
Committed: Fri Jul 3 13:48:42 2015 +0000

----------------------------------------------------------------------
 bigtop_toolchain/files/jenkins.sh.opensuse | 23 +++++++++++++++++++++++
 bigtop_toolchain/manifests/env.pp          |  9 +++++++++
 bigtop_toolchain/manifests/jdk.pp          |  5 +++++
 bigtop_toolchain/manifests/packages.pp     |  2 +-
 4 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/362ca725/bigtop_toolchain/files/jenkins.sh.opensuse
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/files/jenkins.sh.opensuse 
b/bigtop_toolchain/files/jenkins.sh.opensuse
new file mode 100644
index 0000000..b716d90
--- /dev/null
+++ b/bigtop_toolchain/files/jenkins.sh.opensuse
@@ -0,0 +1,23 @@
+# 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.
+
+export MAVEN_HOME=/usr/local/maven
+export JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk
+export ANT_HOME=/usr/local/ant
+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
+
+export GRADLE_OPTS="-Dorg.gradle.daemon=true"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/362ca725/bigtop_toolchain/manifests/env.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/env.pp 
b/bigtop_toolchain/manifests/env.pp
index 023d6ad..738cd96 100644
--- a/bigtop_toolchain/manifests/env.pp
+++ b/bigtop_toolchain/manifests/env.pp
@@ -52,6 +52,15 @@ class bigtop_toolchain::env {
         }
       }
     }
+    OpenSuSE: {
+      file {'/etc/profile.d/bigtop.sh':
+        source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.opensuse',
+        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/362ca725/bigtop_toolchain/manifests/jdk.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk.pp 
b/bigtop_toolchain/manifests/jdk.pp
index c3dcc30..12fe314 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -26,5 +26,10 @@ class bigtop_toolchain::jdk {
         ensure => present
       }
     }
+    /(OpenSuSE)/: {
+      package { 'java-1_7_0-openjdk-devel' :
+        ensure => present
+      }
+    }
   }
 }

http://git-wip-us.apache.org/repos/asf/bigtop/blob/362ca725/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp 
b/bigtop_toolchain/manifests/packages.pp
index 05697cd..dc1db8d 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -24,7 +24,7 @@ class bigtop_toolchain::packages {
        }
        $pkgs = [ "unzip", "curl", "wget", "git", "make", "cmake", "autoconf", 
"automake", "libtool", "gcc", "gcc-c++", "fuse", "createrepo", "lzo-devel", 
"fuse-devel", "cppunit-devel", "openssl-devel", "python-devel", 
"python-setuptools", "libxml2-devel", "libxslt-devel", "cyrus-sasl-devel", 
"sqlite-devel", "openldap-devel", $mysql_devel, "rpm-build", 
"redhat-rpm-config", "fuse-libs", "asciidoc", "xmlto", "libyaml-devel" ]
      }
-    /(?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" ] }
+    /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "curl", "wget", "git", 
"make", "cmake", "autoconf", "automake", "libtool", "gcc", "gcc-c++", "fuse", 
"createrepo", "lzo-devel", "fuse-devel", "cppunit-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|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", 
"python2.7-dev", "libxml2-dev", "libxslt1-dev", "zlib1g-dev", "libsqlite3-dev", 
"libldap2-dev", "libsasl2-dev", "libmysqlclient-dev", "python-setuptools", 
"libkrb5-dev", "asciidoc", "libyaml-dev" ]
 

Reply via email to