홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
3aedc03b 1 parent 6344f574

ONOS-3156 Fixed mysterious execution of Secure-SSH stc step. Doh! 

Change-Id: Ia3d4829bf80169861d428a9c8e9fd8d524ff3425
Inline Side-by-side
Showing 1 changed file with 0 additions and 7 deletions
...@@ -22,14 +22,7 @@ scenario=${1:-smoke} ...@@ -22,14 +22,7 @@ scenario=${1:-smoke}
22 [ -t 1 ] && interactive=true || interactive=false 22 [ -t 1 ] && interactive=true || interactive=false
23 [ -t 1 ] && notInteractive=false || notInteractive=true 23 [ -t 1 ] && notInteractive=false || notInteractive=true
24 24
25 -# stc requires that ONOS_USE_SSH=true, but we will store the old value and reset it after
26 -sshSet=$([ -z ${ONOS_USE_SSH+x} ]) && oldSSH=$ONOS_USE_SSH
27 -export ONOS_USE_SSH=true
28 -
29 # Run stc 25 # Run stc
30 [ -z "$stcDebug" ] && DEBUG_OPTS="" 26 [ -z "$stcDebug" ] && DEBUG_OPTS=""
31 stcColor=${stcColor:-$interactive} stcDumpLogs=${stcDumpLogs:-$notInteractive} \ 27 stcColor=${stcColor:-$interactive} stcDumpLogs=${stcDumpLogs:-$notInteractive} \
32 java $DEBUG_OPTS -jar $JAR $scenario "$@" 28 java $DEBUG_OPTS -jar $JAR $scenario "$@"
33 -
34 -# Reset the old value of ONOS_USE_SSH
35 -[ $sshSet ] && export ONOS_USE_SSH=oldSSH || unset ONOS_USE_SSH
......