From 649d024a064a1803b627cb2e94afe6f1256e535c Mon Sep 17 00:00:00 2001
From: Brian O'Connor <bocon@onlab.us>
Date: Tue, 21 Mar 2017 02:14:18 +0000
Subject: [PATCH] Updating proxy-stc to use basename of test tar

Change-Id: I786d788196413c5c57e8ce42ad631bfd8554b217
---
 bucklets/onos.bucklet    | 2 +-
 tools/test/bin/proxy-stc | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bucklets/onos.bucklet b/bucklets/onos.bucklet
index 38c3dd5156..f6f7e9b48c 100644
--- a/bucklets/onos.bucklet
+++ b/bucklets/onos.bucklet
@@ -313,7 +313,7 @@ def tar_file(
    ):
 
    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 4bf01c85a4..aae0e4be87 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 @@ ssh -t $ONOS_USER@$OCT "
     # 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
 "