aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@oflebbe.de>2015-01-19 20:32:00 +0100
committerOlaf Flebbe <of@oflebbe.de>2015-01-24 18:28:32 +0100
commit4158095e44bb601df99e50534ddfa41ea3e47993 (patch)
tree684515b064b745066fac95e09e473af73660bb58 /bigtop_toolchain
parent83923cf3950e97c5dc93399ff472bbe5559c626b (diff)
downloadbigtop-odpi-4158095e44bb601df99e50534ddfa41ea3e47993.tar.gz
BIGTOP-1610: Fix /etc/profile.d/bigtop.sh scripts
forgot to include debian variant fixup JAVA_HOME after BIGTOP-1609
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/files/jenkins.sh.centos2
-rw-r--r--bigtop_toolchain/files/jenkins.sh.debian24
2 files changed, 25 insertions, 1 deletions
diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos
index c063b93a..5f90bc4c 100644
--- a/bigtop_toolchain/files/jenkins.sh.centos
+++ b/bigtop_toolchain/files/jenkins.sh.centos
@@ -15,7 +15,7 @@
export MAVEN_HOME=/usr/local/maven
export JAVA6_HOME=/usr/java/latest
-export JAVA7_HOME=/usr/lib/jdk7-latest
+export JAVA7_HOME=/usr/lib/jvm/java-1.7.0-openjdk
export JAVA_HOME=$JAVA7_HOME
export ANT_HOME=/usr/local/ant
export FORREST_HOME=/usr/local/apache-forrest
diff --git a/bigtop_toolchain/files/jenkins.sh.debian b/bigtop_toolchain/files/jenkins.sh.debian
new file mode 100644
index 00000000..3d1ef667
--- /dev/null
+++ b/bigtop_toolchain/files/jenkins.sh.debian
@@ -0,0 +1,24 @@
+# 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-amd64
+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"