BIGTOP-1440. a few usability updates to bigtop_toolchain
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3b398778 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3b398778 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3b398778 Branch: refs/heads/branch-0.8 Commit: 3b3987787f31357589730d4d9d77e5eb1ba1d969 Parents: 9aaed1f Author: Roman Shaposhnik <[email protected]> Authored: Sun Sep 7 22:53:59 2014 +0000 Committer: Roman Shaposhnik <[email protected]> Committed: Sun Sep 7 15:55:40 2014 -0700 ---------------------------------------------------------------------- bigtop_toolchain/files/jenkins.sh.centos | 4 +--- bigtop_toolchain/files/jenkins.sh.ubu | 4 +--- bigtop_toolchain/manifests/packages.pp | 6 +++--- bigtop_toolchain/manifests/protobuf.pp | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/3b398778/bigtop_toolchain/files/jenkins.sh.centos ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos index 6ed1025..c063b93 100644 --- a/bigtop_toolchain/files/jenkins.sh.centos +++ b/bigtop_toolchain/files/jenkins.sh.centos @@ -14,15 +14,13 @@ # limitations under the License. export MAVEN_HOME=/usr/local/maven -export PATH=$PATH:$MAVEN_HOME/bin export JAVA6_HOME=/usr/java/latest export JAVA7_HOME=/usr/lib/jdk7-latest export JAVA_HOME=$JAVA7_HOME export ANT_HOME=/usr/local/ant -export PATH=$PATH:$ANT_HOME/bin export FORREST_HOME=/usr/local/apache-forrest export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle -export PATH=$PATH:$FORREST_HOME/bin:$GRADLE_HOME/bin +export PATH=$JAVA7_HOME/bin:$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/3b398778/bigtop_toolchain/files/jenkins.sh.ubu ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.ubu b/bigtop_toolchain/files/jenkins.sh.ubu index 828856d..0b79a5f 100644 --- a/bigtop_toolchain/files/jenkins.sh.ubu +++ b/bigtop_toolchain/files/jenkins.sh.ubu @@ -14,15 +14,13 @@ # limitations under the License. export MAVEN_HOME=/usr/local/maven -export PATH=$PATH:$MAVEN_HOME/bin export JAVA6_HOME=/usr/lib/jvm/java-6-oracle export JAVA7_HOME=/usr/lib/jvm/java-7-oracle export JAVA_HOME=$JAVA7_HOME export ANT_HOME=/usr/local/ant -export PATH=$PATH:$ANT_HOME/bin export FORREST_HOME=/usr/local/apache-forrest export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle -export PATH=$PATH:$FORREST_HOME/bin:$GRADLE_HOME/bin +export PATH=$JAVA_HOME/bin:$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/3b398778/bigtop_toolchain/manifests/packages.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index 2f910cc..762b260 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -15,9 +15,9 @@ class bigtop_toolchain::packages { case $operatingsystem{ - /(?i:(centos|fedora))/: { $pkgs = [ "wget", "git", "make" , "cmake" , "rpm-build" , "lzo-devel", "redhat-rpm-config", "openssl-devel", "fuse-libs", "fuse-devel", "fuse", "gcc", "gcc-c++", "autoconf", "automake", "libtool"] } - /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "wget", "git", "make" , "cmake" , "rpm-devel" , "lzo-devel", "libopenssl-devel", "fuse-devel", "fuse", "gcc", "gcc-c++", "autoconf", "automake", "libtool", "pkg-config"] } - Ubuntu: { $pkgs = [ "liblzo2-dev", "libzip-dev", "sharutils", "libfuse-dev", "cmake", "pkg-config", "debhelper", "devscripts", "protobuf-compiler", "build-essential", "dh-make", "reprepro", "automake", "autoconf", "libfuse2", "libssh-dev", "libjansi-java" ] } + /(?i:(centos|fedora))/: { $pkgs = [ "wget", "git", "make" , "cmake" , "rpm-build" , "lzo-devel", "redhat-rpm-config", "openssl-devel", "fuse-libs", "fuse-devel", "fuse", "gcc", "gcc-c++", "autoconf", "automake", "libtool", "createrepo", "cppunit-devel"] } + /(?i:(SLES|opensuse))/: { $pkgs = [ "unzip", "wget", "git", "make" , "cmake" , "rpm-devel" , "lzo-devel", "libopenssl-devel", "fuse-devel", "fuse", "gcc", "gcc-c++", "autoconf", "automake", "libtool", "pkg-config", "createrepo", "libcppunit-devel"] } + Ubuntu: { $pkgs = [ "liblzo2-dev", "libzip-dev", "sharutils", "libfuse-dev", "cmake", "pkg-config", "debhelper", "devscripts", "protobuf-compiler", "build-essential", "dh-make", "reprepro", "automake", "autoconf", "libfuse2", "libssh-dev", "libjansi-java", "libcppunit-dev" ] } } package { $pkgs: ensure => installed, http://git-wip-us.apache.org/repos/asf/bigtop/blob/3b398778/bigtop_toolchain/manifests/protobuf.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/protobuf.pp b/bigtop_toolchain/manifests/protobuf.pp index 9ddea30..fb7edac 100644 --- a/bigtop_toolchain/manifests/protobuf.pp +++ b/bigtop_toolchain/manifests/protobuf.pp @@ -54,7 +54,7 @@ class bigtop_toolchain::protobuf { } /(?i:(SLES|opensuse))/:{ exec { 'install_mrdocs_repo': - command => '/usr/bin/zypper ar http://download.opensuse.org/repositories/home:/mrdocs:/protobuf-rpm/openSUSE_12.3/ protobuf', + command => '/usr/bin/zypper ar --no-gpgcheck http://download.opensuse.org/repositories/home:/mrdocs:/protobuf-rpm/openSUSE_12.3/ protobuf', unless => "/usr/bin/zypper lr | grep -q protobuf", } }
