홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
1eec5051 1 parent ddec794e

Fixing stc prerequisites to allow ONOS_USE_SSH to be either true or unset/blank. 

Change-Id: I27604f28c34ff7a451847a6b3772d300b46d3d57
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
...@@ -15,9 +15,11 @@ ...@@ -15,9 +15,11 @@
15 --> 15 -->
16 <scenario name="prerequisites" description="ONOS test pre-requisites"> 16 <scenario name="prerequisites" description="ONOS test pre-requisites">
17 <group name="Prerequisites"> 17 <group name="Prerequisites">
18 - <step name="Check-Environment" exec="test -n ${ONOS_ROOT} -a -n ${ONOS_NIC} -a -n ${OC1} -a '${ONOS_USE_SSH}' == 'true'"/> 18 + <step name="Check-Environment"
19 + exec="test -n ${ONOS_ROOT} -a -n ${ONOS_NIC} -a -n ${OC1}"/>
20 + <step name="Check-Secure-SSH"
21 + exec="test '${ONOS_USE_SSH}' == 'true' -o '${ONOS_USE_SSH}' == ''"/>
19 <step name="Check-ONOS-Bits" exec="onos-check-bits"/> 22 <step name="Check-ONOS-Bits" exec="onos-check-bits"/>
20 -
21 <parallel var="${OC#}"> 23 <parallel var="${OC#}">
22 <step name="Check-Passwordless-Login-${#}" 24 <step name="Check-Passwordless-Login-${#}"
23 exec="ssh -n -o ConnectTimeout=3 -o PasswordAuthentication=no ${ONOS_USER}@${OC#} date"/> 25 exec="ssh -n -o ConnectTimeout=3 -o PasswordAuthentication=no ${ONOS_USER}@${OC#} date"/>
......