Repository: bigtop Updated Branches: refs/heads/master c82359bb3 -> 66b84e547
BIGTOP-1841. toolchain can not set java correctly in fedora Signed-off-by: YoungWoo Kim <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/66b84e54 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/66b84e54 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/66b84e54 Branch: refs/heads/master Commit: 66b84e54759676f8da70222f41704d11253f24b7 Parents: c82359b Author: Evans Ye <[email protected]> Authored: Tue Apr 21 17:55:33 2015 +0000 Committer: YoungWoo Kim <[email protected]> Committed: Wed Apr 22 10:18:04 2015 +0900 ---------------------------------------------------------------------- bigtop_toolchain/files/jenkins.sh.fedora | 23 +++++++++++++++++++++++ bigtop_toolchain/manifests/env.pp | 8 ++++++++ bigtop_toolchain/manifests/jdk.pp | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/66b84e54/bigtop_toolchain/files/jenkins.sh.fedora ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.fedora b/bigtop_toolchain/files/jenkins.sh.fedora new file mode 100644 index 0000000..2dc8e14 --- /dev/null +++ b/bigtop_toolchain/files/jenkins.sh.fedora @@ -0,0 +1,23 @@ +# 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 JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk +export ANT_HOME=/usr/local/ant +export SCALA_HOME=/usr/share/java +export GRADLE_HOME=/usr/local/gradle +export PATH=$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/66b84e54/bigtop_toolchain/manifests/env.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp index e66962d..c85dd4b 100644 --- a/bigtop_toolchain/manifests/env.pp +++ b/bigtop_toolchain/manifests/env.pp @@ -24,6 +24,14 @@ class bigtop_toolchain::env { mode => 644, } } + Fedora: { + file {'/etc/profile.d/bigtop.sh': + source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.fedora', + ensure => present, + owner => root, + group => root, + mode => 644, + } default: { file {'/etc/profile.d/bigtop.sh': source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.centos', http://git-wip-us.apache.org/repos/asf/bigtop/blob/66b84e54/bigtop_toolchain/manifests/jdk.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index 1a57fdb..c3dcc30 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -21,7 +21,7 @@ class bigtop_toolchain::jdk { ensure => present } } - /(CentOS|Amazon)/: { + /(CentOS|Fedora|Amazon)/: { package { 'java-1.7.0-openjdk-devel' : ensure => present }
