You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2015/09/24 19:45:05 UTC

bigtop git commit: BIGTOP-1960. The smoke-test wrapper in bigtop-deploy can only be used in redhat series of Linux

Repository: bigtop
Updated Branches:
  refs/heads/master 67348d00b -> 601ebce01


BIGTOP-1960. The smoke-test wrapper in bigtop-deploy can only be used in redhat series of Linux


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/601ebce0
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/601ebce0
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/601ebce0

Branch: refs/heads/master
Commit: 601ebce019a32b8a8ab78b4004deca7a0f73f964
Parents: 67348d0
Author: Evans Ye <ev...@apache.org>
Authored: Sun Aug 9 17:28:23 2015 +0800
Committer: Evans Ye <ev...@apache.org>
Committed: Thu Sep 24 17:44:01 2015 +0000

----------------------------------------------------------------------
 bigtop-deploy/vm/utils/smoke-tests.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/601ebce0/bigtop-deploy/vm/utils/smoke-tests.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/vm/utils/smoke-tests.sh b/bigtop-deploy/vm/utils/smoke-tests.sh
index c10fe82..6491e99 100755
--- a/bigtop-deploy/vm/utils/smoke-tests.sh
+++ b/bigtop-deploy/vm/utils/smoke-tests.sh
@@ -17,6 +17,16 @@
 HCFS_USER="hdfs"
 SMOKE_TESTS=${1:-mapreduce,pig}
 
+# Autodetect JAVA_HOME
+if [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  . /usr/lib/bigtop-utils/bigtop-detect-javahome
+else
+  >&2 echo -e "\nUNABLE TO DETECT JAVAHOME SINCE bigtop-utils NEEDS TO BE INSTALLED!\n"
+  exit 2
+fi
+
+echo -e "\n===== START TO RUN SMOKE TESTS: $SMOKE_TESTS =====\n"
+
 export HADOOP_CONF_DIR=/etc/hadoop/conf/
 export BIGTOP_HOME=/bigtop-home/
 export HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce/
@@ -25,7 +35,6 @@ export PIG_HOME=/usr/lib/pig/
 export FLUME_HOME=/usr/lib/flume/
 export SQOOP_HOME=/usr/lib/sqoop/
 export HIVE_CONF_DIR=/etc/hive/conf/
-export JAVA_HOME="/usr/lib/jvm/java-openjdk/"
 export MAHOUT_HOME="/usr/lib/mahout"
 export ITEST="0.7.0"