diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2019-01-17 16:55:22 -0600 |
---|---|---|
committer | Nicholas E. Bofferding <bofferdn@us.ibm.com> | 2019-02-06 08:16:43 -0600 |
commit | 94fe5da0c6b4b298b92c5b9dddaa5e90bbab8bf0 (patch) | |
tree | 737b10448b1da86a1f063bb651cc4411ce943177 /src/build/citest | |
parent | d9535e0964076972f2d868ccd6e5121c02f27196 (diff) | |
download | blackbird-hostboot-94fe5da0c6b4b298b92c5b9dddaa5e90bbab8bf0.tar.gz blackbird-hostboot-94fe5da0c6b4b298b92c5b9dddaa5e90bbab8bf0.zip |
Add FSPBUILD to CI scripts
Added logic to the autoci scripts for a new FSPBUILD mode. This
mode will perform the following actions:
- Build hostboot with the fsprelease.config file
- Build the errlparser code
- Not run simics
Also added support for a new env var (LOCAL_CI_USER) that can be
used to let you execute 'build-script' locally rather than
trying to use the 'hostboot' user id for some of the operations.
Change-Id: Ifc9d7875e00713cd46a27765aef5d24f88122a50
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70617
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Camvan T. Nguyen <ctnguyen@us.ibm.com>
Reviewed-by: Sameer R. Veer <sveer@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Diffstat (limited to 'src/build/citest')
-rwxr-xr-x | src/build/citest/build-script | 61 | ||||
-rwxr-xr-x | src/build/citest/create-sandbox | 9 | ||||
-rwxr-xr-x | src/build/citest/setup-env | 10 |
3 files changed, 53 insertions, 27 deletions
diff --git a/src/build/citest/build-script b/src/build/citest/build-script index caf718eaa..7510d76c9 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,2018 +# Contributors Listed Below - COPYRIGHT 2014,2019 # [+] International Business Machines Corp. # # @@ -34,6 +34,7 @@ echo "SANDBOXROOT=$SANDBOXROOT" echo "SANDBOXNAME=$SANDBOXNAME" echo "CHIP=$CHIP" echo "PNOR=$PNOR" +echo "CONFIG_FILE=$CONFIG_FILE" echo "#--------------------------------" #export HOSTBOOT_DEBUG=1 #-- Ensure printkd / tracd is compiled in. @@ -59,7 +60,7 @@ CREATESANDBOX_PID=$! my_date=$(date) # Build Hostboot. echo "#--------------------------------" -printf "\n\n$(date): Starting \"make -j32\"\n\n" +printf "\n\n$(date): STARTED running \"make -j32\"\n\n" echo "#--------------------------------" make -j32 || exit -1 echo "#--------------------------------" @@ -80,34 +81,46 @@ fi # Add Hostboot files to simics sandbox. my_date=$(date) echo "#--------------------------------" -printf "\n\n$(date): Now running populate-sandbox....\n\n" +printf "\n\n$(date): STARTED running populate-sandbox....\n\n" echo "#--------------------------------" populate-sandbox || exit -1 echo "#--------------------------------" printf "\n\nrc=$?: $(date): FINISHED running (\"populate-sandbox\" was started at $my_date)\n\n" echo "#--------------------------------" -#@fixme - Temp disable, RTC:170635 -# Start errl parser building. -#build-errl-parsers > errl-parsers.log 2>&1 & -#ERRLPARSERS_PID=$! +if [ "$CHIP" == "FSPBUILD" ]; +then + # Start errl parser building. + my_date=$(date) + printf "\n\n$(date): STARTED running \"build-errl-parsers\"\n\n" + build-errl-parsers > errl-parsers.log 2>&1 & + ERRLPARSERS_PID=$! + + # Check errl parser completion. + wait $ERRLPARSERS_PID + if [ $? -ne 0 ]; then + echo "----Error parsers failed." + cat errl-parsers.log + exit -1 + else + printf "\n\n$(date): FINISHED running (\"build-errl-parsers\" was started at $my_date)\n\n" + fi -# Start CxxTest Simics execution. -my_date=$(date) -echo "#--------------------------------" -printf "\n\n$(date): Now running cxxtest-start.sh....\n\n" -echo "#--------------------------------" -cxxtest-start.sh || exit -1 -echo "#--------------------------------" -printf "\n\nrc=$?: $(date): FINISHED running (\"cxxtest-start.sh\" was started at $my_date)\n\n" -echo "#--------------------------------" -#@fixme - Temp disable, RTC:170635 -# Check errl parser completion. -#wait $ERRLPARSERS_PID -#if [ $? -ne 0 ]; then -# echo "----Error parsers failed." -# cat errl-parsers.log -# exit -1 -#fi +else + printf "2) CHIP=$CHIP" + echo "CHIP3=$CHIP" + + + # Start CxxTest Simics execution. + my_date=$(date) + echo "#--------------------------------" + printf "\n\n$(date): STARTED running cxxtest-start.sh....\n\n" + echo "#--------------------------------" + cxxtest-start.sh || exit -1 + echo "#--------------------------------" + printf "\n\nrc=$?: $(date): FINISHED running (\"cxxtest-start.sh\" was started at $my_date)\n\n" + echo "#--------------------------------" + +fi diff --git a/src/build/citest/create-sandbox b/src/build/citest/create-sandbox index 068734394..7e20ec372 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,2017 +# Contributors Listed Below - COPYRIGHT 2014,2019 # [+] International Business Machines Corp. # # @@ -27,7 +27,12 @@ echo "Creating ODE sandbox..." export CMVC_FAMILY=aix@aix.austin.ibm.com@2035 -export CMVC_BECOME=hostboot +if [ -z $LOCAL_CI_USER ] +then + export CMVC_BECOME=hostboot +else + export CMVC_BECOME=$LOCAL_CI_USER +fi export CMVC_AUTH_METHOD=HOST # Ensure backing build is accessible. diff --git a/src/build/citest/setup-env b/src/build/citest/setup-env index 48e7c0ff4..8eda7b8ed 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,2018 +# Contributors Listed Below - COPYRIGHT 2014,2019 # [+] International Business Machines Corp. # # @@ -37,12 +37,20 @@ echo "MACHINE IS $MACHINE" if [ "$CHIP" == "NIMBUS" ]; then export PNOR=nimbus.pnor + export CONFIG_FILE= elif [ "$CHIP" == "CUMULUS" ]; then export PNOR=cumulus.pnor + export CONFIG_FILE= elif [ "$CHIP" == "CUMULUS_CDIMM" ]; then export PNOR=cumulus_cdimm.pnor + export CONFIG_FILE= +elif [ "$CHIP" == "FSPBUILD" ]; +then + export PNOR=ZZ.pnor + export CONFIG_FILE=src/build/configs/fsprelease.config + export MACHINE=NIMBUS fi # If we are running under Jenkins we need to pick a random-ish sandbox name |