summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/log.sh
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-18 16:20:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-18 16:20:15 +0000
commitabf3446f4eade931f3b98b0894028c242440ccbd (patch)
treea6cdd5e870a844e35d11ee58616ad38ebd9a9b32 /mcp/scripts/log.sh
parent2190992952ccc7987f4fbcaf856340ce1ca69c1f (diff)
parent644dc6a6cd8c4a309352a2b2602d757f4acbf63b (diff)
Merge "states: Break on error, retry states up to 5 times" into stable/euphrates
Diffstat (limited to 'mcp/scripts/log.sh')
-rwxr-xr-xmcp/scripts/log.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/mcp/scripts/log.sh b/mcp/scripts/log.sh
index 8c4bf3ef5..8bfd0d553 100755
--- a/mcp/scripts/log.sh
+++ b/mcp/scripts/log.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
@@ -10,12 +10,14 @@
# Collect /var/log from all cluster nodes via Salt Master
#
+# shellcheck disable=SC1090
+[ -n "${SSH_OPTS}" ] || source "$(dirname "${BASH_SOURCE[0]}")/globals.sh"
+
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
DEPLOY_LOG=$1
OPNFV_TMP_LOG="opnfv_fuel_logs"
[ -n "${DEPLOY_LOG}" ] || exit 0
-# shellcheck disable=SC1090
-[ -n "${SSH_OPTS}" ] || source "$(dirname "${BASH_SOURCE[0]}")/globals.sh"
# ssh to cfg01
# shellcheck disable=SC2086,2087