You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by yw...@apache.org on 2015/03/23 08:43:45 UTC
bigtop git commit: BIGTOP-1768: Use openjdk in ubuntu14,
Remove references to jdk6
Repository: bigtop
Updated Branches:
refs/heads/master c8235426b -> 785902193
BIGTOP-1768: Use openjdk in ubuntu14, Remove references to jdk6
Signed-off-by: YoungWoo Kim <yw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/78590219
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/78590219
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/78590219
Branch: refs/heads/master
Commit: 78590219352f7c661d03c68c2330398ce86ed40c
Parents: c823542
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Sun Mar 22 19:45:33 2015 +0100
Committer: YoungWoo Kim <yw...@apache.org>
Committed: Mon Mar 23 16:43:11 2015 +0900
----------------------------------------------------------------------
bigtop_toolchain/files/jenkins.sh.ubu | 26 ----------
bigtop_toolchain/manifests/env.pp | 11 +---
bigtop_toolchain/manifests/jdk.pp | 18 +------
bigtop_toolchain/manifests/jdk6.pp | 81 ------------------------------
4 files changed, 2 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/78590219/bigtop_toolchain/files/jenkins.sh.ubu
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/files/jenkins.sh.ubu b/bigtop_toolchain/files/jenkins.sh.ubu
deleted file mode 100644
index 99b5d8e..0000000
--- a/bigtop_toolchain/files/jenkins.sh.ubu
+++ /dev/null
@@ -1,26 +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.
-
-export MAVEN_HOME=/usr/local/maven
-export JAVA6_HOME=/usr/lib/jvm/java-6-oracle
-export JAVA7_HOME=/usr/lib/jdk7-latest
-export JAVA_HOME=$JAVA7_HOME
-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=$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/78590219/bigtop_toolchain/manifests/env.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp
index 656560f..e66962d 100644
--- a/bigtop_toolchain/manifests/env.pp
+++ b/bigtop_toolchain/manifests/env.pp
@@ -15,16 +15,7 @@
class bigtop_toolchain::env {
case $operatingsystem{
- /Ubuntu/: {
- file { '/etc/profile.d/bigtop.sh':
- source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.ubu',
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- }
- }
- /Debian/: {
+ Ubuntu,Debian: {
file { '/etc/profile.d/bigtop.sh':
source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.debian',
ensure => present,
http://git-wip-us.apache.org/repos/asf/bigtop/blob/78590219/bigtop_toolchain/manifests/jdk.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp
index c086cad..1a57fdb 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -16,7 +16,7 @@
class bigtop_toolchain::jdk {
case $operatingsystem{
- Debian: {
+ Debian,Ubuntu: {
package { 'openjdk-7-jdk' :
ensure => present
}
@@ -26,21 +26,5 @@ class bigtop_toolchain::jdk {
ensure => present
}
}
-
- default : {
- file { '/tmp/jdk-7u60-linux-x64.gz':
- source => 'puppet:///modules/bigtop_toolchain/jdk-7u60-linux-x64.gz',
- ensure => present,
- owner => root,
- group => root,
- mode => 755
- }
-
- exec {'/bin/tar -xzvf /tmp/jdk-7u60-linux-x64.gz; ln -s jdk1.7.0_60 jdk7-latest':
- cwd => '/usr/lib',
- refreshonly => true,
- subscribe => File["/tmp/jdk-7u60-linux-x64.gz"],
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/78590219/bigtop_toolchain/manifests/jdk6.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/jdk6.pp b/bigtop_toolchain/manifests/jdk6.pp
deleted file mode 100644
index ce4b3d0..0000000
--- a/bigtop_toolchain/manifests/jdk6.pp
+++ /dev/null
@@ -1,81 +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::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"],
- }
- }
- }
-}