Changes to docker file and cluster creation, complete stc test on single instance, but not yet on multi-instances Alao, we add detailed checking for every step in ODTN testing.
Change-Id: Id074e2db89a8892ed263880cfa670c4861e011b9
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 3f23719..811921b 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -46,12 +46,12 @@
export ONOS_ADMIN_BITS=onos-admin-${ONOS_VERSION%~*}
export ONOS_ADMIN_TAR=$ONOS_STAGE_ROOT/$ONOS_ADMIN_BITS.tar.gz
-export ONOS_INSTALL_DIR="/opt/onos" # Installation directory on remote
-export ATOMIX_INSTALL_DIR="/opt/atomix" # Installation directory for Atomix
+export ONOS_INSTALL_DIR="${ONOS_INSTALL_DIR:-/opt/onos}" # Installation directory on remote
+export ATOMIX_INSTALL_DIR="${ATOMIX_INSTALL_DIR:-/opt/atomix}" # Installation directory for Atomix
export OCI="${OCI:-localhost}" # ONOS Controller Instance
export ONOS_USER="${ONOS_USER:-sdn}" # ONOS user on remote system
export ONOS_GROUP="${ONOS_GROUP:-sdn}" # ONOS group on remote system
-export ONOS_PWD="rocks" # ONOS user password on remote system
+export ONOS_PWD="${ONOS_PWD:-rocks}" # ONOS user password on remote system
export ONOS_SCENARIOS=$ONOS_ROOT/tools/test/scenarios
export ONOS_CLUSTER_KEY_FILE="/tmp/onos.jks"