Make fabric config commands return successful exit status
Change-Id: I5c5161c8b737bf0a1e4253cf4ec25416cd7cafc8
(cherry picked from commit a174840bb2476439ef52c9ca8b6448e42e4109b6)
diff --git a/Jenkinsfile.newBuildSystem b/Jenkinsfile.newBuildSystem
index 2e53c1a..2ef7bd4 100644
--- a/Jenkinsfile.newBuildSystem
+++ b/Jenkinsfile.newBuildSystem
@@ -222,20 +222,14 @@
"${config.fabric_switches[i].pass}",
"sed -i -e 's/#port_mode_${config.fabric_switches[i].breakout_ports[j]}=/port_mode_${config.fabric_switches[i].breakout_ports[j]}=/g' /etc/accton/ofdpa.conf")
}
+ // Prepending killit command with ! ensures the command will return exit status 0
runFabricCmd("${config.head.ip}",
"${config.head.user}",
"${config.head.pass}",
"${config.fabric_switches[i].ip}",
"${config.fabric_switches[i].user}",
"${config.fabric_switches[i].pass}",
- "/root/killit")
- runFabricCmd("${config.head.ip}",
- "${config.head.user}",
- "${config.head.pass}",
- "${config.fabric_switches[i].ip}",
- "${config.fabric_switches[i].user}",
- "${config.fabric_switches[i].pass}",
- "/root/connect -bg")
+ "! /root/killit; /root/connect -bg")
}
}
}