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/07/31 19:19:14 UTC
[geode] branch develop updated: GEODE-5511: Show important commands
during CI builds.
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 f635abb GEODE-5511: Show important commands during CI builds.
f635abb is described below
commit f635abb4969d85c3da5c587cdec55bc6019bda62
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 31 12:11:09 2018 -0700
GEODE-5511: Show important commands during CI builds.
Signed-off-by: Finn Southerland <fs...@pivotal.io>
---
ci/scripts/build.sh | 2 ++
ci/scripts/execute_tests.sh | 5 ++++-
ci/scripts/rsync_code_down.sh | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index cf03e95..60d9fe3 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -90,8 +90,10 @@ ln -s ${ROOT_DIR}/geode ${GEODE_BUILD_DIR}
pushd ${GEODE_BUILD_DIR}
set +e
+set -x
./gradlew --no-daemon --parallel -PbuildId=${BUILD_ID} --system-prop "java.io.tmpdir=${TMPDIR}" build
GRADLE_EXIT_STATUS=$?
+set +x
set -e
popd
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index b771703..6c203c8 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -68,10 +68,13 @@ if [ -v CALL_STACK_TIMEOUT ]; then
ssh -i ${SSHKEY_FILE} 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
-ssh -i ${SSHKEY_FILE} geode@${INSTANCE_IP_ADDRESS} "mkdir -p tmp && cd geode && ./gradlew \
+GRADLE_COMMAND="./gradlew \
${PARALLEL_DUNIT} \
${DUNIT_PARALLEL_FORKS} \
-PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}') \
${DEFAULT_GRADLE_TASK_OPTIONS} \
${GRADLE_TASK} \
${GRADLE_TASK_OPTIONS}"
+
+echo "${GRADLE_COMMAND}"
+ssh -i ${SSHKEY_FILE} geode@${INSTANCE_IP_ADDRESS} "mkdir -p tmp && cd geode && ${GRADLE_COMMAND}"
diff --git a/ci/scripts/rsync_code_down.sh b/ci/scripts/rsync_code_down.sh
index d536c28..96e872c 100755
--- a/ci/scripts/rsync_code_down.sh
+++ b/ci/scripts/rsync_code_down.sh
@@ -43,3 +43,4 @@ OUTPUT_DIR=${BASE_DIR}/geode-results
set -x
time ssh -i ${SSHKEY_FILE} geode@${INSTANCE_IP_ADDRESS} "cd geode && ./gradlew combineReports && chmod -R a+r */build/"
time rsync -e "ssh -i ${SSHKEY_FILE}" -ah geode@${INSTANCE_IP_ADDRESS}:. ${OUTPUT_DIR}/.
+set +x