From 75ff355eece472c4e3d2587642c0e06aff28281a Mon Sep 17 00:00:00 2001 From: Sreejith Punnapuzha Date: Mon, 6 Jan 2020 14:06:06 -0600 Subject: [PATCH] Disable verbose output on normal run This PS removes set -x from general runs so that all the commands will not be thrown in output. Change-Id: I8068e170d632518a93f5bf097d3a88cc3af01433 Signed-off-by: Sreejith Punnapuzha --- tools/multi_nodes_gate/airship_gate/lib/virsh.sh | 1 - .../airship_gate/on_error/collect_genesis_info.sh | 1 - tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh | 2 +- tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh index c48043bc..a26e1969 100644 --- a/tools/multi_nodes_gate/airship_gate/lib/virsh.sh +++ b/tools/multi_nodes_gate/airship_gate/lib/virsh.sh @@ -484,7 +484,6 @@ vol_create_disk() { } vm_create() { - set -x NAME=${1} DISK_OPTS="$(vm_create_vols "${NAME}")" NETWORK_OPTS="$(vm_create_interfaces "${NAME}")" diff --git a/tools/multi_nodes_gate/airship_gate/on_error/collect_genesis_info.sh b/tools/multi_nodes_gate/airship_gate/on_error/collect_genesis_info.sh index 26d6bfc9..a13744be 100755 --- a/tools/multi_nodes_gate/airship_gate/on_error/collect_genesis_info.sh +++ b/tools/multi_nodes_gate/airship_gate/on_error/collect_genesis_info.sh @@ -15,7 +15,6 @@ # NOTE(mark-burnett): Keep trying to collect info even if there's an error set +e -set -x KUBECONFIG="${KUBECONFIG:-/etc/kubernetes/admin/kubeconfig.yaml}" source "${GATE_UTILS}" diff --git a/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh b/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh index 228edbc2..f95cd4a2 100755 --- a/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh +++ b/tools/multi_nodes_gate/airship_gate/stages/pegleg-collect.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xe +set -e source "${GATE_UTILS}" diff --git a/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh b/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh index 1132d928..283a7ce4 100755 --- a/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh +++ b/tools/multi_nodes_gate/airship_gate/stages/pegleg-render.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xe +set -e source "${GATE_UTILS}"