Fix boot-tests for BMC machines due to FSP password in dotfile

Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/external/boot-tests/boot_test.sh b/external/boot-tests/boot_test.sh
index 09d0c27f..316a35d0 100755
--- a/external/boot-tests/boot_test.sh
+++ b/external/boot-tests/boot_test.sh
@@ -38,7 +38,7 @@ function linux_boot {
 	ipmiresult=$($IPMI_COMMAND sol deactivate 2>&1);
 	retval=$?
 	if [ $retval -ne 0 -a "$ipmiresult" != "Info: SOL payload already de-activated" ]; then
-	    error "IPMI failed; it has probably stalled on the FSP."
+	    msg "IPMI sol deactivate failed; IPMI may have stalled, may just be IPMI. Good luck."
 	fi
 
 	LINUXBOOT_LOG=$(mktemp --tmpdir builder-2.XXXXXX);
diff --git a/external/boot-tests/fsp_support.sh b/external/boot-tests/fsp_support.sh
index 87d7ca05..db115885 100644
--- a/external/boot-tests/fsp_support.sh
+++ b/external/boot-tests/fsp_support.sh
@@ -2,11 +2,11 @@
 BOOT_TIMEOUT="20";
 
 #Username/password for for ssh to FSP machines
-SSHUSER=${SSHUSER:-}
-SSHPASS=${SSHPASS:-}
+SSHUSER=${FSPSSHUSER:-}
+SSHPASS=${FSPSSHPASS:-}
 
 if [ -z $SSHUSER ] || [ -z $SSHPASS ] ; then
-	msg "Set SSHUSER and SSHPASS in ENV or ~/.skiboot_boot_tests"
+	msg "Set FSPSSHUSER and FSPSSHPASS in ENV or ~/.skiboot_boot_tests"
 	exit 1;
 fi
 
@@ -113,7 +113,7 @@ function boot_firmware {
 	i=0;
 	state=$($SSHCMD "$GET_PROFILE; smgr mfgState");
 	while [ \( "$state" != "runtime" \) -a \( "$i" -lt "$BOOT_TIMEOUT" \) ] ; do
-		msg "Waiting $BOOT_SLEEP_PERIOD more seconds";
+		msg "Waiting $BOOT_SLEEP_PERIOD more seconds (istep: `grep iStep $ISTEP_LOG|tail -n 1`)";
 		sleep "$BOOT_SLEEP_PERIOD";
 		i=$(expr $i + 1);
 		state=$($SSHCMD "$GET_PROFILE; smgr mfgState");