From e47bff27a1ce085dc27d25059eb408a49b811eb9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 8 Jun 2018 19:46:12 +0200 Subject: [state] Stop expecting linux.network failures Now that the `linux.network` state applies cleanly on all nodes, stop expecting failures to prevent false-positive passes. Change-Id: I8a283474e12b85deb95815e4e7a0af4a74d143ac Signed-off-by: Alexandru Avadanii --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/scripts/salt.sh') diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 14581bacb..e6a589e62 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -113,7 +113,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.apply salt' wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage' - wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' || true + wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' salt -C "E@^(${NODE_MASK}).*" state.sls opnfv.route_wrapper salt -C "E@^(${NODE_MASK}).*" system.reboot wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping' -- cgit 1.2.3-korg