You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/10/17 19:31:42 UTC
[accumulo-testing] branch master updated: ACCUMULO-4718 Add
CLASSPATH to script
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 966bb41 ACCUMULO-4718 Add CLASSPATH to script
966bb41 is described below
commit 966bb41df34e8b17cc68ab58e05caa65ebd2bd28
Author: Mike Miller <mm...@apache.org>
AuthorDate: Tue Oct 17 15:31:41 2017 -0400
ACCUMULO-4718 Add CLASSPATH to script
---
bin/accumulo-testing | 7 ++++---
conf/accumulo-testing-env.sh.example | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/accumulo-testing b/bin/accumulo-testing
index 84a1d40..3412564 100755
--- a/bin/accumulo-testing
+++ b/bin/accumulo-testing
@@ -70,6 +70,7 @@ fi
function build_shade_jar() {
export at_shaded_jar="$at_home/core/target/accumulo-testing-core-$at_version-shaded.jar"
+ export CLASSPATH="$at_shaded_jar:$CLASSPATH"
if [ ! -f "$at_shaded_jar" ]; then
echo "Building $at_shaded_jar"
cd "$at_home" || exit 1
@@ -185,7 +186,7 @@ randomwalk_main="org.apache.accumulo.testing.core.randomwalk.Framework"
case "$1" in
ci-createtable)
build_shade_jar
- java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" org.apache.accumulo.testing.core.continuous.CreateTable "$at_props"
+ java -Dlog4j.configuration="file:$log4j_config" org.apache.accumulo.testing.core.continuous.CreateTable "$at_props"
;;
ci-local)
if [ -z "$2" ]; then
@@ -195,7 +196,7 @@ ci-local)
fi
determine_app_main "$2"
build_shade_jar
- java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" "$ci_main" "$at_props"
+ java -Dlog4j.configuration="file:$log4j_config" "$ci_main" "$at_props"
;;
ci-yarn)
if [ -z "$2" ]; then
@@ -229,7 +230,7 @@ rw-local)
exit 1
fi
build_shade_jar
- java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" "$randomwalk_main" "$at_props" "$2"
+ java -Dlog4j.configuration="file:$log4j_config" "$randomwalk_main" "$at_props" "$2"
;;
rw-yarn)
if [ -z "$2" ]; then
diff --git a/conf/accumulo-testing-env.sh.example b/conf/accumulo-testing-env.sh.example
index e03c973..677c23d 100644
--- a/conf/accumulo-testing-env.sh.example
+++ b/conf/accumulo-testing-env.sh.example
@@ -20,6 +20,8 @@ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
export ACCUMULO_VERSION=`accumulo version`
export HADOOP_VERSION=`hadoop version | head -n1 | awk '{print $2}'`
export ZOOKEEPER_VERSION=3.4.9
+# Make sure Hadoop configuration directory is on the classpath
+export CLASSPATH=$HADOOP_PREFIX/etc/hadoop
# Agitator
# ========
--
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <co...@accumulo.apache.org>'].