diff options
author | Helen Chen <helen.chen@huawei.com> | 2018-05-22 16:56:35 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-05-22 16:56:35 +0000 |
commit | bffa4cda6c25bd57e9d28238ff20645d00cfc3ef (patch) | |
tree | 90d8f3cd0db52970c5c8df0dc66ab2d06d43b06b | |
parent | e75120e24b93e5d978ab8e3611b70aa3c1e74d36 (diff) | |
parent | 793902d15f625ba244a27a18bc425edb7ee7eee7 (diff) |
Merge "Clean up HEAT health check script" into beijing
-rwxr-xr-x | test/ete/scripts/run-healthcheck.sh | 6 |
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 |