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:12 UTC
[2/3] git commit: BIGTOP-1439. split jdk7 and jdk6 in Bigtop toolchain
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"],
+ }
+ }
+ }
+}