diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2018-06-14 14:28:32 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-06-18 15:36:09 -0400 |
| commit | 36d47d4ca26d23c67224cb370409e5f59f378c4b (patch) | |
| tree | ac2fb133a14ce663b23471cedd26cb25f2ef3fb4 /src/build/citest | |
| parent | 2432d94f7f533fae253e4a9b43b4acfb23615836 (diff) | |
| download | talos-hostboot-36d47d4ca26d23c67224cb370409e5f59f378c4b.tar.gz talos-hostboot-36d47d4ca26d23c67224cb370409e5f59f378c4b.zip | |
Update bbuild to b0608a_1823.920 and CUMULUS/Jenkins Fix
This commit updates the bbuild to b0608a_1823.920 and removes some
workarounds that aren't needed anymore. It also contains a fix in
autocitest that should allow the CUMULUS standalone config to run
correctly on Jenkins.
Change-Id: I500353152af1126a2d5e016378dd7e0784b15c99
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60690
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/citest')
| -rwxr-xr-x | src/build/citest/autocitest | 3 | ||||
| -rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 10 |
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 |
