From 82ee98bd8d4c7855c620518611973679b1ed1a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Busse?= Date: Sun, 7 Mar 2021 03:31:29 +0100 Subject: [PATCH] testsuite: Change JAVA_HOME --- tests/hdfs-setup.sh | 12 ++++++------ tests/test_hbase_exporter.sh | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/hdfs-setup.sh b/tests/hdfs-setup.sh index a961dc3..253c28e 100755 --- a/tests/hdfs-setup.sh +++ b/tests/hdfs-setup.sh @@ -66,19 +66,19 @@ create_hdfs_config() { dfs.namenode.rpc-address.$2.nn1 - localhost:8020 - - - dfs.namenode.rpc-address.$2.nn2 master-1:8020 + + dfs.namenode.rpc-address.$2.nn2 + master-2:8020 + dfs.namenode.http-address.$2.nn1 - localhost:50070 + master-1:50070 dfs.namenode.http-address.$2.nn2 - master-1:50070 + master-2:50070 dfs.namenode.name.dir diff --git a/tests/test_hbase_exporter.sh b/tests/test_hbase_exporter.sh index 711bfc7..53ce44e 100644 --- a/tests/test_hbase_exporter.sh +++ b/tests/test_hbase_exporter.sh @@ -11,7 +11,12 @@ HDFS_CMD_FORMAT="./hadoop/bin/hdfs --config hadoop/etc/hadoop namenode -format" source setup.sh setup_suite() { - export JAVA_HOME=${JAVA_HOME:-"/usr/local"} + if [ "FreeBSD" = $(uname) ]; then + export JAVA_HOME=${JAVA_HOME:-"/usr/local"} + else + export JAVA_HOME=${JAVA_HOME:-"/"} + fi + export HADOOP_PREFIX="$(pwd)/hadoop" # Setup HBase