You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/12/24 16:29:51 UTC
[geode] branch develop updated: Fixes JAVA_HOME for jstack
execution for hung tests.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 76c6122 Fixes JAVA_HOME for jstack execution for hung tests.
76c6122 is described below
commit 76c6122fb99aa9ea1d4b93c224984e28ed0ad5c1
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Dec 24 08:29:30 2018 -0800
Fixes JAVA_HOME for jstack execution for hung tests.
---
ci/scripts/execute_build.sh | 2 +-
ci/scripts/execute_tests.sh | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ci/scripts/execute_build.sh b/ci/scripts/execute_build.sh
index 7990018..ff23960 100755
--- a/ci/scripts/execute_build.sh
+++ b/ci/scripts/execute_build.sh
@@ -92,7 +92,7 @@ fi
SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64"
if [ -v CALL_STACK_TIMEOUT ]; then
- ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m"
+ ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "${SET_JAVA_HOME} && tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m"
fi
GRADLE_ARGS="\
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index 38010fc..a4e793e 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -64,10 +64,6 @@ else
fi
-if [ -v CALL_STACK_TIMEOUT ]; then
- ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m"
-fi
-
case $ARTIFACT_SLUG in
windows*)
JAVA_BUILD_PATH=C:/java${JAVA_BUILD_VERSION}
@@ -81,6 +77,12 @@ case $ARTIFACT_SLUG in
;;
esac
+
+if [ -v CALL_STACK_TIMEOUT ]; then
+ ssh ${SSH_OPTIONS} geode@${INSTANCE_IP_ADDRESS} "export JAVA_HOME=${JAVA_TEST_PATH} && tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m"
+fi
+
+
GRADLE_ARGS=" \
-PcompileJVM=${JAVA_BUILD_PATH} \
-PcompileJVMVer=${JAVA_BUILD_VERSION} \