Updating proxy-stc to use basename of test tar
Change-Id: I786d788196413c5c57e8ce42ad631bfd8554b217
diff --git a/bucklets/onos.bucklet b/bucklets/onos.bucklet
index 38c3dd5..f6f7e9b 100644
--- a/bucklets/onos.bucklet
+++ b/bucklets/onos.bucklet
@@ -313,7 +313,7 @@
):
cmd = ( 'mkdir -p $TMP/%(root_dir)s && '
- 'cp -r $SRCDIR/ $TMP/%(root_dir)s && '
+ 'cp -r -L $SRCDIR/* $TMP/%(root_dir)s && '
'tar -C $TMP -zcf $OUT %(root_dir)s' ) % {
'root_dir': root if root is not None else name
}
diff --git a/tools/test/bin/proxy-stc b/tools/test/bin/proxy-stc
index 4bf01c8..aae0e4b 100755
--- a/tools/test/bin/proxy-stc
+++ b/tools/test/bin/proxy-stc
@@ -9,10 +9,10 @@
onos-push-test-bits $OCT
onos-push-bits $OCT
-ssh -t $ONOS_USER@$OCT "
+ssh -t -t $ONOS_USER@$OCT "
# Unpack the test tools
cd /tmp; rm -fr \$(ls -Fd onos-test-*/)
- tar xf $ONOS_TEST_TAR
+ tar xf \$(basename $ONOS_TEST_TAR)
# Source in the cell environment
$(onos-cell | sed 's/^/export /')
@@ -22,12 +22,15 @@
# prime the environment.
cd \$(ls -Fd onos-test-*/)
export ONOS_ROOT=\$PWD
- source tools/dev/bash_profile
+ export ONOS_STAGE_ROOT=/tmp
+ export ONOS_TEST_STAGE_ROOT=/tmp
+ source \$ONOS_ROOT/tools/dev/bash_profile
setPrimaryInstance 1
onos-verify-cell # TODO: remove once warden does this for us
# Finally, execute required STC scenario(s) using the default topology
topo default
export stcDumpLogs=true
+ export stcColor=$stcColor
stc fast
"