Merge lp:~bladernr/checkbox/1629417-fix-power-ipmitest into lp:checkbox

[Jeff Lane ]

Modifies the ipmi_test script so it no longer fails if a module fails to load. This is because some arches don't use the same modules. Thus on Power, the script was failing because ipmi_si was failing, but power uses ipmi_devintf and ipmi_ssif instead.

So now the script will just warn on module failure, and move on to attempting comms with the BMC. If THAT fails the script will still return a fail code.

This has been tested on a failing OpenPower system as well as an x86 system (to ensure it doesn't break there).

[Paul Larson (pwlars)]

This seems reasonable to me, but I don't have a good way to test it myself. As you say you've tested it on the affected system though I'm +1. At the very least, module loading failures shouldn't prevent any currently-working systems from continuing to run, even given the new modules that you load.

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/ipmi_test'
--- providers/plainbox-provider-checkbox/bin/ipmi_test	2015-07-07 22:13:42 +0000
+++ providers/plainbox-provider-checkbox/bin/ipmi_test	2016-09-30 19:43:17 +0000
@@ -1,27 +1,31 @@
 #!/bin/bash
 
 # Now make sure the modules are loaded
-for module in ipmi_si ipmi_devintf ipmi_msghandler; do
+for module in ipmi_si ipmi_devintf ipmi_powernv ipmi_ssif ipmi_msghandler; do
     if lsmod |grep -q $module; then
         echo "$module already loaded"
     else
-        echo "Loading $module..."
-        modprobe $module
+        echo "Attempting to load $module..."
+        modprobe $module > /dev/null
         result=$?
         # If the IPMI drivers don't load, it could be the system has no BMC, or
-        # the IPMI driver is bad.  We should error and Fail here.
+        # the IPMI driver is bad or not applicable to this SUT.
         if [ $result -eq 1 ]; then
-            echo "ERROR: Unable to load module $module" >&2
-            echo "Aborting IPMI test run." >&2
-            exit 1
+            echo
+            echo "*******************************************"
+            echo "WARNING: Unable to load module $module"
+            echo "Continuing run, but in-band IPMI may fail"
+            echo "*******************************************"
+            echo
         else
-            echo "Successfully loaded module $module"
+            echo "Successfully loaded module $module\n\n"
         fi
     fi
 done
 
 # Now get our info from ipmitool to make sure communication works
 # First lest check chassis status
+echo
 echo "Checking for chassis status"
 ipmitool chassis status && echo "Successfully got chassis status" && chassis=0 || chassis=1
 echo "Checking to see if we can get sensor data"