홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
534f4762 1 parent c217cb99

Miscellaneous STC adjustments 

Change-Id: Ia1d5629d075646192f154b03bec6a71a8ac44dbd
Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
...@@ -13,7 +13,7 @@ state=$3 ...@@ -13,7 +13,7 @@ state=$3
13 for attempt in {1..30}; do 13 for attempt in {1..30}; do
14 onos ${node:-$OCI} scr:list | grep $component > $aux 14 onos ${node:-$OCI} scr:list | grep $component > $aux
15 15
16 - if grep -q $state $aux; then 16 + if grep $state $aux; then
17 exit 0 17 exit 0
18 else 18 else
19 sleep 1 19 sleep 1
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1 6 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
7 . $ONOS_ROOT/tools/build/envDefaults 7 . $ONOS_ROOT/tools/build/envDefaults
8 8
9 -export MAX_WAIT=60 9 +export MAX_WAIT=${ONOS_MN_TIMEOUT:-90}
10 10
11 cmd="$1" && shift 11 cmd="$1" && shift
12 log="screenlog.0" 12 log="screenlog.0"
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 <group name="Query2" requires="Netcfg.Post-2"> 52 <group name="Query2" requires="Netcfg.Post-2">
53 <parallel var="${OC#}" starts="Netcfg.Query-2-${#}"> 53 <parallel var="${OC#}" starts="Netcfg.Query-2-${#}">
54 <!-- Check that the values made it into the config for the DHCP server --> 54 <!-- Check that the values made it into the config for the DHCP server -->
55 - <step name="Netcfg.QueryDhcp-2-${#}" 55 + <step name="Netcfg.QueryDhcp-2-${#}" delay="2"
56 exec="check-dhcp-netcfg.py ${OC#} ttl=21 lease=22 renew=23 rebind=24 delay=25 timeout=26"/> 56 exec="check-dhcp-netcfg.py ${OC#} ttl=21 lease=22 renew=23 rebind=24 delay=25 timeout=26"/>
57 </parallel> 57 </parallel>
58 </group> 58 </group>
......