From 1da9757e5dfdebd14c870c40a3d1a7f9ab5ede87 Mon Sep 17 00:00:00 2001 From: Lei YU Date: Thu, 16 Jan 2020 15:18:09 +0800 Subject: meta-palmetto: Fix issues found by HW CI HW CI on Palmetto trigers two issues: 1. The case to verify occ active fails because it was using the last character of `cpux` for occ, e.g. cpu0 -> occ0. Palmetto had an incorrect inventory path of `cpu`, which results in `occu`, and it becomes an incorrect path, and the case gets a 404 error while trying to get the OCC active state. 2. The case to get https://$bmc/ fails, it's expecting HTTP 200 OK resonse, but got a 401 error. This is because webui is not built into Palmetto, so there is no page, and bmcweb returns 401 for such case. Fix the above cases. Tested: Verify the HW CI succeeds on Palmetto: python3 -m robot -v OPENBMC_HOST:palmetto --argumentfile \ test_lists/HW_CI --exclude Verify_Redfish_Host_PowerOn --include \ Verify_Redfish_Host_PowerOn_No_Check_Watts redfish tests (From meta-ibm rev: 4ac52cb28db30f89bdfd23ab1614f71b65dfdceb) Signed-off-by: Lei YU Change-Id: Ifd102f167cfa4d83769fb055b883e4c214a27b9a Signed-off-by: Brad Bishop --- .../configuration/palmetto-yaml-config/palmetto-ipmi-sensors.yaml | 2 +- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-ibm/meta-palmetto') diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config/palmetto-ipmi-sensors.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config/palmetto-ipmi-sensors.yaml index 372ad2dbb..349b8b988 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config/palmetto-ipmi-sensors.yaml +++ b/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config/palmetto-ipmi-sensors.yaml @@ -584,7 +584,7 @@ deassert: false type: bool mutability: Mutability::Write|Mutability::Read - path: /system/chassis/motherboard/cpu + path: /system/chassis/motherboard/cpu0 readingType: assertion sensorNamePattern: nameLeaf sensorReadingType: 111 diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c0748b966..52b9468cc 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-inventory_append_palmetto = " openpower-occ-control" +RDEPENDS_${PN}-inventory_append_palmetto = " openpower-occ-control phosphor-webui" -- cgit v1.2.3