aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelen Chen <helen.chen@huawei.com>2018-05-22 16:57:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-22 16:57:19 +0000
commitf3268eed36063936fa80748696bbdccdbf50bc3f (patch)
tree13fd692d69ac1b4fb29a2cff11b698e4ff9231fc
parent77947ca4768d3c6b82bc2a3e0747851b7b2f0a20 (diff)
parente003192163f37c339cec20a144f3b74aad3a6ecb (diff)
Merge "Clean up HEAT health check script"
-rwxr-xr-xtest/ete/scripts/run-healthcheck.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/ete/scripts/run-healthcheck.sh b/test/ete/scripts/run-healthcheck.sh
index e2ed3986f..e97ac3ff5 100755
--- a/test/ete/scripts/run-healthcheck.sh
+++ b/test/ete/scripts/run-healthcheck.sh
@@ -19,10 +19,12 @@ fi
ssh-keygen -R ${ROBOT_IP}
+set +x
timeout 15m ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh
RESULT=$?
+set -x
-LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | head -1")
+LOG_DIR=$(ssh -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | grep health | head -1")
echo "Browse Robot results at http://${ROBOT_IP}:88/logs/${LOG_DIR}/"
-rsync -e "ssh -i ${SSH_KEY}" -avPz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/
+rsync -e "ssh -i ${SSH_KEY}" -avtz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/
exit $RESULT