mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 01:41:26 +02:00
Code Issues Projects Releases Wiki Activity

Updating proxy-stc to use basename of test tar

Browse Source 
Change-Id: I786d788196413c5c57e8ce42ad631bfd8554b217
This commit is contained in:
Brian O'Connor 2017-03-21 02:14:18 +00:00 committed by Thomas Vachuska
parent da5ae57b84
commit 649d024a06
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bucklets/onos.bucklet
View File

@ -313,7 +313,7 @@ def tar_file(
): ):
cmd = ( 'mkdir -p $TMP/%(root_dir)s && ' 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' ) % { 'tar -C $TMP -zcf $OUT %(root_dir)s' ) % {
'root_dir': root if root is not None else name 'root_dir': root if root is not None else name
} }

9
tools/test/bin/proxy-stc
View File

@ -9,10 +9,10 @@
onos-push-test-bits $OCT onos-push-test-bits $OCT
onos-push-bits $OCT onos-push-bits $OCT
ssh -t $ONOS_USER@$OCT " ssh -t -t $ONOS_USER@$OCT "
# Unpack the test tools # Unpack the test tools
cd /tmp; rm -fr \$(ls -Fd onos-test-*/) cd /tmp; rm -fr \$(ls -Fd onos-test-*/)
tar xf $ONOS_TEST_TAR tar xf \$(basename $ONOS_TEST_TAR)
# Source in the cell environment # Source in the cell environment
$(onos-cell | sed 's/^/export /') $(onos-cell | sed 's/^/export /')
@ -22,12 +22,15 @@ ssh -t $ONOS_USER@$OCT "
# prime the environment. # prime the environment.
cd \$(ls -Fd onos-test-*/) cd \$(ls -Fd onos-test-*/)
export ONOS_ROOT=\$PWD 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 setPrimaryInstance 1
onos-verify-cell # TODO: remove once warden does this for us onos-verify-cell # TODO: remove once warden does this for us
# Finally, execute required STC scenario(s) using the default topology # Finally, execute required STC scenario(s) using the default topology
topo default topo default
export stcDumpLogs=true export stcDumpLogs=true
export stcColor=$stcColor
stc fast stc fast
" "