From 4cc167cc6e554b49421ad741c52d9688fc1d9c09 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 11 Dec 2023 17:50:57 +0100 Subject: [PATCH] Test redfish with reduced sushy-tools feature set Two jobs are changed to test a reduced Redfish implementation: one PXE job uses the minimum version (only boot/power management) one vmedia job uses the reduced version (+ NICs, virtual media) Change-Id: Ib3afdb26b9cd36c0e4f3d736b9c69a5bf508fc0e --- devstack/lib/ironic | 5 ++++- zuul.d/ironic-jobs.yaml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index d51068b7db..e89f2c4c60 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -435,6 +435,7 @@ IRONIC_VPDU_SYSTEMD_SERVICE=devstack@virtualpdu.service IRONIC_REDFISH_EMULATOR_PORT=${IRONIC_REDFISH_EMULATOR_PORT:-9132} IRONIC_REDFISH_EMULATOR_SYSTEMD_SERVICE="devstack@redfish-emulator.service" IRONIC_REDFISH_EMULATOR_CONFIG=${IRONIC_REDFISH_EMULATOR_CONFIG:-$IRONIC_CONF_DIR/redfish/emulator.conf} +IRONIC_REDFISH_EMULATOR_FEATURE_SET=${IRONIC_REDFISH_EMULATOR_FEATURE_SET:-full} # To explicitly enable configuration of Glance with Swift # (which is required by some vendor drivers), set this @@ -1063,7 +1064,8 @@ function install_redfish { git_clone_by_name "sushy-tools" setup_dev_lib "sushy-tools" else - pip_install "sushy-tools" + # 1.1.0 adds support for feature sets + pip_install "sushy-tools>=1.1.0" fi local cmd @@ -1098,6 +1100,7 @@ SUSHY_EMULATOR_BOOT_LOADER_MAP = { 'x86_64': None } } +SUSHY_EMULATOR_FEATURE_SET = "$IRONIC_REDFISH_EMULATOR_FEATURE_SET" EOF } diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 890b74dd4b..6ef8a6ec94 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -276,6 +276,8 @@ # Reset the callback to a normal-ish value. IRONIC_CALLBACK_TIMEOUT: 600 IRONIC_BOOT_MODE: bios + # Make sure this feature works even with the minumum implementation + IRONIC_REDFISH_EMULATOR_FEATURE_SET: minimum devstack_services: # Parent job uses swift, this one does not, thus we can turn it off. s-account: False @@ -304,6 +306,7 @@ IRONIC_GRUB2_SHIM_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/BOOTX64.EFI IRONIC_GRUB2_FILE: https://mirror.iad3.inmotion.opendev.org/centos-stream/9-stream/BaseOS/x86_64/os/EFI/BOOT/grubx64.efi IRONIC_GRUB2_CONFIG_PATH: EFI/BOOT/grub.cfg + IRONIC_REDFISH_EMULATOR_FEATURE_SET: vmedia devstack_services: s-account: True s-container: True