From 08d92e0c3c79a702ee495ab5359bd734da05535e Mon Sep 17 00:00:00 2001 From: Boris Glimcher Date: Mon, 26 Feb 2024 21:41:33 +0200 Subject: [PATCH] feat(bmc_fw_update): compare version with filename This is instead of comparing before and after version Fixes #22 Signed-off-by: Boris Glimcher --- roles/bmc_fw_update/tasks/main.yml | 8 ++++---- roles/get_bmc_facts/tasks/main.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/bmc_fw_update/tasks/main.yml b/roles/bmc_fw_update/tasks/main.yml index e5617d3..ce48113 100644 --- a/roles/bmc_fw_update/tasks/main.yml +++ b/roles/bmc_fw_update/tasks/main.yml @@ -82,7 +82,7 @@ ansible.builtin.debug: msg: "{{ bmc_firmware_version }}" -- name: Validate fw image changed from before - ansible.builtin.assert: - that: - - get_bmc_facts_before.redfish_facts.firmware.entries[0].Version != get_bmc_facts_after.redfish_facts.firmware.entries[0].Version +- name: Validate fw image matches given filename + ansible.builtin.fail: + msg: "checking..." + when: not bmc_fw_update_image.bmc is search(bmc_firmware_version | regex_search('[0-9-.]+')) diff --git a/roles/get_bmc_facts/tasks/main.yml b/roles/get_bmc_facts/tasks/main.yml index 11905ee..757738e 100644 --- a/roles/get_bmc_facts/tasks/main.yml +++ b/roles/get_bmc_facts/tasks/main.yml @@ -16,4 +16,4 @@ - name: Extract BMC firmware version from inventory ansible.builtin.set_fact: - bmc_firmware_version: "{{ result.redfish_facts.firmware | community.general.json_query('entries[?Id==`BMC_Firmware`].Version') }}" + bmc_firmware_version: "{{ result.redfish_facts.firmware | community.general.json_query('entries[?Id==`BMC_Firmware`].Version') | first }}"