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/09/08 00:57:11 UTC
[1/3] git commit: BIGTOP-1438. asciidoc is no longer needed by Sqoop
Repository: bigtop
Updated Branches:
refs/heads/master e93a21db8 -> 3b3987787
BIGTOP-1438. asciidoc is no longer needed by Sqoop
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f86a4549
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f86a4549
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f86a4549
Branch: refs/heads/master
Commit: f86a454918f39fc44b303b672c5afc25fbf98903
Parents: e93a21d
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Sun Sep 7 22:37:44 2014 +0000
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Sun Sep 7 15:42:18 2014 -0700
----------------------------------------------------------------------
README.md | 2 +-
bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec | 1 -
bigtop_toolchain/manifests/packages.pp | 6 +++---
src/site/xdoc/index.xml | 1 -
4 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f86a4549/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 893de30..c1e24d4 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ __On all systems, Building Apache Bigtop requires the following tools__
* Additionally, some details for specific linux versions :
* __Debian__ based distros need these packages : build-essential dh-make debhelper devscripts, reprepro
- * __openSUSE 11.4__ needs these packages : relaxngDatatypedocbook-utils docbook-simple, asciidoc, fuse-devel, docbook5, docbook5-xsl-stylesheets, libxml2-devel, xmlformat, xmlto, libxslt, libopenssl-devel
+ * __openSUSE 11.4__ needs these packages : relaxngDatatypedocbook-utils docbook-simple, fuse-devel, docbook5, docbook5-xsl-stylesheets, libxml2-devel, xmlformat, xmlto, libxslt, libopenssl-devel
* __Building packages__ : `make [component-name]-[rpm|deb]`
* __Building local YUM/APT repositories__ : `make [component-name]-[yum|apt]`
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f86a4549/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 989c83c..c8b1acd 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -69,7 +69,6 @@ Source9: sqoop-server.svc
Source10: sqoop-server.sh
Source11: tomcat-deployment.sh
Buildarch: noarch
-BuildRequires: asciidoc
Requires: hadoop-client, bigtop-utils >= 0.7, bigtop-tomcat, %{name}-client = %{version}-%{release}
%description
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f86a4549/bigtop_toolchain/manifests/packages.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 7612de5..2f910cc 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", "asciidoc", "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", "asciidoc", "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", "asciidoc", "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"] }
+ /(?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" ] }
}
package { $pkgs:
ensure => installed,
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f86a4549/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index f7e4697..1e6202f 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -77,7 +77,6 @@
<li>automake</li>
<li>libtool</li>
<li>sharutils</li>
- <li>asciidoc</li>
<li>xmlto</li>
</ul>
</td>
[2/3] git commit: BIGTOP-1439. split jdk7 and jdk6 in Bigtop toolchain
Posted by rv...@apache.org.
BIGTOP-1439. split jdk7 and jdk6 in Bigtop toolchain
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9aaed1f4
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9aaed1f4
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9aaed1f4
Branch: refs/heads/master
Commit: 9aaed1f4a4ee5c6845f6a3dec1a1bb191cba8a0f
Parents: f86a454
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Sun Sep 7 22:50:49 2014 +0000
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Sun Sep 7 15:55:37 2014 -0700
----------------------------------------------------------------------
bigtop_toolchain/manifests/installer.pp | 1 +
bigtop_toolchain/manifests/jdk.pp | 71 ------------------------
bigtop_toolchain/manifests/jdk6.pp | 81 ++++++++++++++++++++++++++++
3 files changed, 82 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9aaed1f4/bigtop_toolchain/manifests/installer.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/installer.pp b/bigtop_toolchain/manifests/installer.pp
index 871732c..a723d60 100644
--- a/bigtop_toolchain/manifests/installer.pp
+++ b/bigtop_toolchain/manifests/installer.pp
@@ -15,6 +15,7 @@
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/9aaed1f4/bigtop_toolchain/manifests/jdk.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp
index 5bf5678..50a2b7e 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -14,74 +14,6 @@
# limitations under the License.
class bigtop_toolchain::jdk {
- case $::lsbdistcodename{
- /(precise|trusty|lucid)/: {
- $apt_add_repo_name = $::lsbdistcodename ? {
- 'trusty' => 'software-properties-common',
- default => 'python-software-properties',
- }
-
- package {$apt_add_repo_name:
- ensure => present,
- }
-
- exec {'add_webupd8team_ppa':
- command => $::lsbdistcodename ? {
- 'lucid' => '/usr/bin/apt-add-repository ppa:webupd8team/java',
- default => '/usr/bin/apt-add-repository -y ppa:webupd8team/java'
- },
- unless => '/usr/bin/test -f /etc/apt/sources.list.d/webupd8team-java-precise.list',
- require => Package[$apt_add_repo_name],
- }
-
- exec {'/usr/bin/apt-get update':
- refreshonly => true,
- subscribe => Exec['add_webupd8team_ppa'],
- require => Exec['add_webupd8team_ppa'],
- }
-
- exec {"accept-license1":
- command => "echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections",
- path => ["/bin", "/usr/bin"],
- require => Exec['/usr/bin/apt-get update'],
- refreshonly => true,
- subscribe => Exec['/usr/bin/apt-get update'],
- }
-
- exec {"accept-license2":
- command => "echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections",
- path => ["/bin", "/usr/bin"],
- require => Exec["accept-license1"],
- refreshonly => true,
- subscribe => Exec["accept-license1"],
- }
-
- package {'oracle-java6-installer':
- ensure => present,
- require => Exec["accept-license2"],
- }
-
- package {'oracle-java7-installer':
- ensure => present,
- require => Exec["accept-license2"],
- }
-
- }
- default: {
- file { '/tmp/jdk-6u45-linux-amd64.rpm':
- source => 'puppet:///modules/bigtop_toolchain/jdk-6u45-linux-amd64.rpm',
- ensure => present,
- owner => root,
- group => root,
- mode => 755
- }
-
- exec {'/bin/rpm -Uvh /tmp/jdk-6u45-linux-amd64.rpm':
- cwd => '/tmp',
- refreshonly => true,
- subscribe => File["/tmp/jdk-6u45-linux-amd64.rpm"],
- }
-
file { '/tmp/jdk-7u60-linux-x64.gz':
source => 'puppet:///modules/bigtop_toolchain/jdk-7u60-linux-x64.gz',
ensure => present,
@@ -95,7 +27,4 @@ class bigtop_toolchain::jdk {
refreshonly => true,
subscribe => File["/tmp/jdk-7u60-linux-x64.gz"],
}
-
- }
- }
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9aaed1f4/bigtop_toolchain/manifests/jdk6.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk6.pp b/bigtop_toolchain/manifests/jdk6.pp
new file mode 100644
index 0000000..ce4b3d0
--- /dev/null
+++ b/bigtop_toolchain/manifests/jdk6.pp
@@ -0,0 +1,81 @@
+# 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::jdk6 {
+ case $::lsbdistcodename{
+ /(precise|trusty|lucid)/: {
+ $apt_add_repo_name = $::lsbdistcodename ? {
+ 'trusty' => 'software-properties-common',
+ default => 'python-software-properties',
+ }
+
+ package {$apt_add_repo_name:
+ ensure => present,
+ }
+
+ exec {'add_webupd8team_ppa':
+ command => $::lsbdistcodename ? {
+ 'lucid' => '/usr/bin/apt-add-repository ppa:webupd8team/java',
+ default => '/usr/bin/apt-add-repository -y ppa:webupd8team/java'
+ },
+ unless => '/usr/bin/test -f /etc/apt/sources.list.d/webupd8team-java-precise.list',
+ require => Package[$apt_add_repo_name],
+ }
+
+ exec {'/usr/bin/apt-get update':
+ refreshonly => true,
+ subscribe => Exec['add_webupd8team_ppa'],
+ require => Exec['add_webupd8team_ppa'],
+ }
+
+ exec {"accept-license1":
+ command => "echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections",
+ path => ["/bin", "/usr/bin"],
+ require => Exec['/usr/bin/apt-get update'],
+ refreshonly => true,
+ subscribe => Exec['/usr/bin/apt-get update'],
+ }
+
+ exec {"accept-license2":
+ command => "echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections",
+ path => ["/bin", "/usr/bin"],
+ require => Exec["accept-license1"],
+ refreshonly => true,
+ subscribe => Exec["accept-license1"],
+ }
+
+ package {'oracle-java6-installer':
+ ensure => present,
+ require => Exec["accept-license2"],
+ }
+
+ }
+ default: {
+ file { '/tmp/jdk-6u45-linux-amd64.rpm':
+ source => 'puppet:///modules/bigtop_toolchain/jdk-6u45-linux-amd64.rpm',
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 755
+ }
+
+ exec {'/bin/rpm -Uvh /tmp/jdk-6u45-linux-amd64.rpm':
+ cwd => '/tmp',
+ refreshonly => true,
+ subscribe => File["/tmp/jdk-6u45-linux-amd64.rpm"],
+ }
+ }
+ }
+}
[3/3] git commit: BIGTOP-1440. a few usability updates to
bigtop_toolchain
Posted by rv...@apache.org.
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/master
Commit: 3b3987787f31357589730d4d9d77e5eb1ba1d969
Parents: 9aaed1f
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Sun Sep 7 22:53:59 2014 +0000
Committer: Roman Shaposhnik <rv...@apache.org>
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",
}
}