Repository: bigtop Updated Branches: refs/heads/master c25a210b3 -> e7f105341
BIGTOP-1218: Add JDK7 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/e7f10534 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e7f10534 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e7f10534 Branch: refs/heads/master Commit: e7f105341ed245515bab821b0dbde2b546179898 Parents: c25a210 Author: Mark Grover <[email protected]> Authored: Wed Jun 25 10:39:56 2014 -0700 Committer: Mark Grover <[email protected]> Committed: Wed Jun 25 10:39:56 2014 -0700 ---------------------------------------------------------------------- bigtop_toolchain/README.md | 4 +++- bigtop_toolchain/files/jenkins.sh.centos | 1 + bigtop_toolchain/files/jenkins.sh.ubu | 1 + bigtop_toolchain/manifests/jdk.pp | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/e7f10534/bigtop_toolchain/README.md ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/README.md b/bigtop_toolchain/README.md index 7b904d8..da33030 100644 --- a/bigtop_toolchain/README.md +++ b/bigtop_toolchain/README.md @@ -76,11 +76,13 @@ where <path_to_bigtop> is the cloned git repo. ## Requirements -Due to redistribution restrictions the Oracle JDK must be downloaded seperately. +For RedHat/Centos, due to redistribution restrictions the Oracle JDK must be downloaded seperately. Download the JDK 64bit rpm.bin file, run it with the -x switch to extract the rpm file and copy jdk-6u45-linux-amd64.rpm to files/. +Download the JDK 64 bit jdk-7u60-linux-x64.gz file into files/ + The Ant/Maven/Forrest sources will be downloaded automatically. If you already have them and do not want to download them again please copy the source .tar.gz files into /usr/src. http://git-wip-us.apache.org/repos/asf/bigtop/blob/e7f10534/bigtop_toolchain/files/jenkins.sh.centos ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos index b2a8b0d..b48d867 100644 --- a/bigtop_toolchain/files/jenkins.sh.centos +++ b/bigtop_toolchain/files/jenkins.sh.centos @@ -16,6 +16,7 @@ export MAVEN_HOME=/usr/local/maven export PATH=$PATH:$MAVEN_HOME/bin export JAVA_HOME=/usr/java/latest +export JAVA7_HOME=/usr/lib/jdk7-latest export ANT_HOME=/usr/local/ant export PATH=$PATH:$ANT_HOME/bin export FORREST_HOME=/usr/local/apache-forrest http://git-wip-us.apache.org/repos/asf/bigtop/blob/e7f10534/bigtop_toolchain/files/jenkins.sh.ubu ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.ubu b/bigtop_toolchain/files/jenkins.sh.ubu index 2ff62fd..5684e10 100644 --- a/bigtop_toolchain/files/jenkins.sh.ubu +++ b/bigtop_toolchain/files/jenkins.sh.ubu @@ -16,6 +16,7 @@ export MAVEN_HOME=/usr/local/maven export PATH=$PATH:$MAVEN_HOME/bin export JAVA_HOME=/usr/lib/jvm/java-6-oracle +export JAVA7_HOME=/usr/lib/jvm/java-7-oracle export ANT_HOME=/usr/local/ant export PATH=$PATH:$ANT_HOME/bin export FORREST_HOME=/usr/local/apache-forrest http://git-wip-us.apache.org/repos/asf/bigtop/blob/e7f10534/bigtop_toolchain/manifests/jdk.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index a91f0ec..fef8b56 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -51,6 +51,12 @@ class bigtop_toolchain::jdk { ensure => present, require => Exec["accept-license2"], } + + package {'oracle-java7-installer': + ensure => present, + require => Exec["accept-license2"], + } + } default: { file { '/tmp/jdk-6u45-linux-amd64.rpm': @@ -66,6 +72,21 @@ class bigtop_toolchain::jdk { 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, + 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"], + } + } } }
