aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorEvans Ye <evansye@apache.org>2015-04-21 17:55:33 +0000
committerYoungWoo Kim <ywkim@apache.org>2015-04-22 10:18:04 +0900
commit66b84e54759676f8da70222f41704d11253f24b7 (patch)
tree2922e1ea60bcd308997b4aa28faf65789f78f7ac /bigtop_toolchain
parentc82359bb3418a96dc8dc18f5d2d45c8d37a80283 (diff)
downloadbigtop-odpi-66b84e54759676f8da70222f41704d11253f24b7.tar.gz
BIGTOP-1841. toolchain can not set java correctly in fedora
Signed-off-by: YoungWoo Kim <ywkim@apache.org>
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/files/jenkins.sh.fedora23
-rw-r--r--bigtop_toolchain/manifests/env.pp8
-rw-r--r--bigtop_toolchain/manifests/jdk.pp2
3 files changed, 32 insertions, 1 deletions
diff --git a/bigtop_toolchain/files/jenkins.sh.fedora b/bigtop_toolchain/files/jenkins.sh.fedora
new file mode 100644
index 00000000..2dc8e144
--- /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"
diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp
index e66962d2..c85dd4b7 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',
diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp
index 1a57fdb1..c3dcc30e 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
}