From dd476b708e1f9d7501dc6c6b6f8c02f997d36afb Mon Sep 17 00:00:00 2001 From: blsaws Date: Fri, 1 Apr 2016 16:36:30 -0700 Subject: Merge dmz01 test into one script; add parameter check, echo statements. JIRA: COPPER-4 Change-Id: I7c33dfe1d66bc58c57eac8214d03693273756414 Signed-off-by: blsaws (cherry picked from commit 392621ce7e9a72c0972f01fbac7ea4dddd21e60d) --- tests/adhoc/dmz01-clean.sh | 34 ++++++++++-- tests/adhoc/dmz01.sh | 133 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 tests/adhoc/dmz01.sh diff --git a/tests/adhoc/dmz01-clean.sh b/tests/adhoc/dmz01-clean.sh index 5a6ca7e..c218ef2 100644 --- a/tests/adhoc/dmz01-clean.sh +++ b/tests/adhoc/dmz01-clean.sh @@ -24,58 +24,82 @@ # After test, cleanup with # $ source ~/git/copper/tests/adhoc/dmz01-clean.sh -set -x #echo on +if [ $1 == "debug" ]; then set -x #echo on +fi source ~/admin-openrc.sh <