diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh index 304ec00f..740a23bc 100755 --- a/gitlab-ci/shared.sh +++ b/gitlab-ci/shared.sh @@ -180,9 +180,11 @@ function install_sysmngr_as_micro_service() SYSMNGR_FIRMWARE_IMAGE='y' \ SYSMNGR_REBOOTS='y' \ SYSMNGR_NETWORK_PROPERTIES='y' \ - SYSMNGR_VENDOR_EXTENSIONS='y' + SYSMNGR_VENDOR_EXTENSIONS='y' \ + SYSMNGR_FWBANK_UBUS_SUPPORT='y' exec_cmd cp /opt/dev/sysmngr/src/sysmngr /usr/sbin/ + exec_cmd mkdir /etc/sysmngr } function error_on_zero() diff --git a/test/files/usr/libexec/rpcd/fwbank b/test/files/etc/sysmngr/fwbank similarity index 100% rename from test/files/usr/libexec/rpcd/fwbank rename to test/files/etc/sysmngr/fwbank diff --git a/test/files/tmp/fwbank.data b/test/files/tmp/fwbank.data index e35a1aa3..27554879 100644 --- a/test/files/tmp/fwbank.data +++ b/test/files/tmp/fwbank.data @@ -1,24 +1 @@ -{ - "bank": [ - { - "name": "A", - "id": 1, - "active": true, - "boot": true, - "upgrade": false, - "fwver": "DG400PRIME-A-IOPSYS-6.3.0BETA1-210908_1319", - "swver": "6.3.0BETA1", - "status": "Active" - }, - { - "name": "B", - "id": 2, - "active": false, - "boot": false, - "upgrade": true, - "fwver": "DG400PRIME-A-IOPSYS-6.2.0RC1-210624_0041", - "swver": "6.2.0RC1", - "status": "Available" - } - ] -} +{ "bank": [ { "name": "A", "id": 1, "active": false, "boot": false, "upgrade": true, "fwver": "iowrt-7.4.2beta2_dev-38-gdc70645400-20241127-175600-ipq95xx-generic-sh40j", "swver": "7.4.2beta2_dev-38-gdc70645400", "omci_swver": "7.4.2beta2_dev-38-gdc70645400", "status": "Available" }, { "name": "B", "id": 2, "active": true, "boot": true, "upgrade": false, "fwver": "iowrt-7.4.2beta2_dev-45-g4906255270-20241128-151448-ipq95xx-generic-sh40j", "swver": "7.4.2beta2_dev-45-g4906255270", "omci_swver": "7.4.2beta2_dev-45-g4906255270", "status": "Active" } ] }