3 files changed, 4 insertions, 11 deletions
diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index 7db66c0d8..8048f23a4 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -234,7 +234,8 @@ while true; do
     sleep 5
     HRMOR=`autosim $NOWIN --simcmd   "python \"getHRMOR()\""| tr -d '\n\r'`
     echo "HRMOR = $HRMOR"
-    if [ "$HRMOR" != "$BL_HRMOR" ]; then
+
+    if [[ "$HRMOR" -ne "$BL_HRMOR" ]] && [[ "$HRMOR" -ne 0 ]]; then
         echo "SBE and Hostboot bootloader completed successfully"
         break
     fi
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 52ebd69b4..b95893122 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1,2 +1,2 @@
-/esw/fips920/Builds/b0414a_1815.920
+/esw/fips920/Builds/b0608a_1823.920
 
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index deb563d16..8444a18ff 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -33,17 +33,9 @@
 #cp $BACKING_BUILD/src/simu/data/cec-chip/base_cec_chip_file $sb/simu/data/cec-chip
 #patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File
 
-#pull-in SBE makefile change for cumulus DD1.2
-sbex -t 1051972
-cd $sb/sbei/sbfw/
-mk -a && mk install_all
-cd -
-
-#grab new action files for Centaur
-sbex -t 1055588
-
 ### Update p9c.act and p9n.act for IOVALID HWP change in commit https://ralgit01.raleigh.ibm.com/gerrit1/#/c/59022/
 echo "+++ Updating p9c.act and p9n.act for IOVALID actions +++"
+mkdir $sb/simu/data/cec-chip
 cp $BACKING_BUILD/src/simu/data/cec-chip/p9c.act $sb/simu/data/cec-chip
 cp $BACKING_BUILD/src/simu/data/cec-chip/p9n.act $sb/simu/data/cec-chip
 patch -p0 $sb/simu/data/cec-chip/p9c.act $PROJECT_ROOT/src/build/citest/etc/patches/p9c.act.iovalid.patch