Fix Simics hb_machine, Enable Simics for CI

RTC: 137477
Change-Id: I57d1b410ebaaccc6e270ea7ff15f83fe7c70f177
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23054
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

9 files changed, 34 insertions, 43 deletions

diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index f4b804ad0..557860282 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2015
+# Contributors Listed Below - COPYRIGHT 2011,2016
 # [+] International Business Machines Corp.
 #
 #
diff --git a/src/build/citest/build-script b/src/build/citest/build-script
index 9acb14b9d..0df20fdcb 100755
--- a/src/build/citest/build-script
+++ b/src/build/citest/build-script
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -71,8 +71,7 @@ build-errl-parsers > errl-parsers.log 2>&1 &
 ERRLPARSERS_PID=$!
 
 # Start CxxTest Simics execution.
-#@todo-RTC:137477-Turn this back on
-#cxxtest-start.sh || exit -1
+cxxtest-start.sh || exit -1
 
 # Check errl parser completion.
 wait $ERRLPARSERS_PID
diff --git a/src/build/citest/create-sandbox b/src/build/citest/create-sandbox
index 4f8662924..f008822e6 100755
--- a/src/build/citest/create-sandbox
+++ b/src/build/citest/create-sandbox
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -48,26 +48,27 @@ fi
 mksb -rc $SANDBOXRC -dir $SANDBOXROOT -back $BACKING_BUILD -sb $SANDBOXNAME \
       -m ppc -auto || exit -1
 
-# TODO: RTC:137477-Turn this pre/post workaround scripts and start simics
 # workaround scripts expect $sb variable to be populated.
-#export sb=$SANDBOXBASE/src
+export sb=$SANDBOXBASE/src
+export bb=$BACKING_BUILD
+export bbsrc=$BACKING_BUILD/src
 
 # Run presimsetup workarounds.
-#echo "----Running presimsetup workarounds."
-#if [ -f ${CITESTPATH}/etc/workarounds.presimsetup ];
-#then
-#    ${CITESTPATH}/etc/workarounds.presimsetup || exit -1
-#fi
+echo "----Running presimsetup workarounds."
+if [ -f ${CITESTPATH}/etc/workarounds.presimsetup ];
+then
+    ${CITESTPATH}/etc/workarounds.presimsetup || exit -1
+fi
 
 # Run start_simics to populate simics directories.
-#echo "----Setting up simics."
-#execute_in_sandbox "start_simics -no_start -machine $MACHINE -batch_mode" \
-#                   "ppc" || exit -1
+echo "----Setting up simics."
+execute_in_sandbox "start_simics -no_start -machine $MACHINE -batch_mode" \
+                   "ppc" || exit -1
 
 # Run postsimsetup workarounds.
-#echo "----Running postsimsetup workarounds."
-#if [ -f ${CITESTPATH}/etc/workarounds.postsimsetup ];
-#then
-#    ${CITESTPATH}/etc/workarounds.postsimsetup || exit -1
-#fi
+echo "----Running postsimsetup workarounds."
+if [ -f ${CITESTPATH}/etc/workarounds.postsimsetup ];
+then
+    ${CITESTPATH}/etc/workarounds.postsimsetup || exit -1
+fi
 
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index feebdc90f..6c26bedd5 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips910/Builds/b1229a_1550.910
+/esw/fips910/Builds/b0106a_1604.910
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index 1b3e3c573..f42aa7b9b 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -35,13 +35,13 @@
 #patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File
 
 
-echo "+++ Fixing pnor file in p9_nimbus.simics"
+echo "+++ SW331544 Fixing pnor file in p9_nimbus.simics"
 cp -f $sb/../simics/targets/p9_nimbus/p9_nimbus.simics $sb/../simics/targets/p9_nimbus/p9_nimbus_nolink.simics
 cp -f $sb/../simics/targets/p9_nimbus/p9_nimbus_nolink.simics $sb/../simics/targets/p9_nimbus/p9_nimbus.simics
 chmod 666 $sb/../simics/targets/p9_nimbus/p9_nimbus.simics
 sed -i '/$image_name =/c\$image_name = "nimbus.pnor"' $sb/../simics/targets/p9_nimbus/p9_nimbus.simics
 
-echo "+++ Patching simicsInfo NIMBUS flash definitions"
+echo "+++ SW331544 Patching simicsInfo NIMBUS flash definitions"
 mkdir -p $sb/simu/data
 cp $bbsrc/simu/data/simicsInfo $sb/simu/data/
 chmod 666 $sb/simu/data/simicsInfo
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 2ddbef73b..bf3113561 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -34,19 +34,3 @@
 #egrep -v "WSALIAS DEFAULT FIPSLEVEL|WSALIAS DEFAULT SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
 #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo
 #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo
-
-echo "+++ Patching P8_MURANO.config for mailbox move."
-mkdir -p $sb/simu/configs
-grep -v "GFW_P8_HB_UNSECURE_OFFSET" \
-    $BACKING_BUILD/src/simu/configs/P8_MURANO.config > \
-    $sb/simu/configs/P8_MURANO.config
-echo "SETENV GFW_P8_HB_UNSECURE_OFFSET 58720256" >> \
-    $sb/simu/configs/P8_MURANO.config
-
-echo "+++ Patching P8_VENICE.config for mailbox move."
-grep -v "GFW_P8_HB_UNSECURE_OFFSET" \
-    $BACKING_BUILD/src/simu/configs/P8_VENICE.config > \
-    $sb/simu/configs/P8_VENICE.config
-echo "SETENV GFW_P8_HB_UNSECURE_OFFSET 58720256" >> \
-    $sb/simu/configs/P8_VENICE.config
-
diff --git a/src/build/citest/populate-sandbox b/src/build/citest/populate-sandbox
index c05f5dacd..0b64fa29a 100755
--- a/src/build/citest/populate-sandbox
+++ b/src/build/citest/populate-sandbox
@@ -6,7 +6,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2014
+# Contributors Listed Below - COPYRIGHT 2014,2016
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/src/build/citest/setup-env b/src/build/citest/setup-env
index db90ecf01..36224845c 100755
--- a/src/build/citest/setup-env
+++ b/src/build/citest/setup-env
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -30,7 +30,7 @@ export PATH=${CITESTPATH}:${PATH}
 # Determine backing build.
 export BACKING_BUILD=`cat ${CITESTPATH}/etc/bbuild`
 # Limit pnor image to be built to murano for standalone simics
-export PNOR=murano.pnor
+export PNOR=nimbus.pnor
 
 # If we are running under Jenkins we need to pick a random-ish sandbox name
 # so that the autoipl tools do not have a /tmp name collision.
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index 9beeaf231..6da417c5a 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -3,7 +3,12 @@ $hb_startup_path = (lookup-file hbfw/startup.simics)
 $hb_script_location = (python "''.join(map('/'.__add__,\""+$hb_startup_path+"\"[1:].split('/')[0:-1]))")
 python "os.environ['HB_TOOLPATH'] = \""+$hb_script_location+"\""
 
-python "os.environ['HB_MACHINE'] = os.environ['MACHINE']"
+$model = (shell "printenv CEC_MODEL")
+$hb_machine = "unknown"
+if ($model == "p9_nimbus") {$hb_machine = "nimbus"}
+if ($model == "p9zz_1s2u") {$hb_machine = "zztop"}
+python "os.environ['HB_MACHINE'] = \""+$hb_machine+"\""
+echo "HB_MACHINE is: "+$hb_machine
 
 
 # Setup some common vars to use across machine types