automated: linux: allow disabling custom variable in ota-update

This patch allows to set empty u-boot custom variable name. This will prevent the test script from attempting to set the variable during the test. It is important for boards that use RPMB with only a list of allowed variables. Signed-off-by: Milosz Wasilewski <[email protected]>
Linaro · Jun 13, 2024 · d34f5cb · d34f5cb
1 parent 7dd49eb
commit d34f5cb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/automated/linux/ota-update/download-update.sh b/automated/linux/ota-update/download-update.sh
@@ -111,7 +111,7 @@ touch /var/sota/ota.signal
 touch /var/sota/ota.result
 report_pass "${TYPE}-create-signal-files"
 
-if [ "${TYPE}" = "uboot" ]; then
+if [ "${TYPE}" = "uboot" ] && [ -n "${U_BOOT_VARIABLE_NAME}" ]; then
     "${UBOOT_VAR_SET_TOOL}" "${U_BOOT_VARIABLE_NAME}" "${U_BOOT_VARIABLE_VALUE}"
 fi
 #systemctl mask aktualizr-lite
@@ -148,8 +148,12 @@ compare_test_value "${TYPE}_rollback_before_download" "${ref_rollback_before_dow
 upgrade_available_before_download=$(uboot_variable_value upgrade_available)
 compare_test_value "${TYPE}_upgrade_available_before_download" "${ref_upgrade_available_before_download}" "${upgrade_available_before_download}"
 if [ "${TYPE}" = "uboot" ]; then
-    uboot_variable_before_download=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
-    compare_test_value "${TYPE}_uboot_variable_value_before_download" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_before_download}"
+    if [ -n "${U_BOOT_VARIABLE_NAME}" ]; then
+        uboot_variable_before_download=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
+        compare_test_value "${TYPE}_uboot_variable_value_before_download" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_before_download}"
+    else
+        report_skip "${TYPE}_uboot_variable_value_before_download"
+    fi
 fi
 
 if [ -f /usr/lib/firmware/version.txt ]; then
@@ -210,8 +214,12 @@ else
 fi
 
 if [ "${TYPE}" = "uboot" ]; then
-    uboot_variable_after_download=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
-    compare_test_value "${TYPE}_uboot_variable_value_after_download" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_after_download}"
+    if [ -n "${U_BOOT_VARIABLE_NAME}" ]; then
+        uboot_variable_after_download=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
+        compare_test_value "${TYPE}_uboot_variable_value_after_download" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_after_download}"
+    else
+        report_skip "${TYPE}_uboot_variable_value_after_download"
+    fi
 fi
 
 UPGRADE_AVAILABLE="${upgrade_available_after_download}"

diff --git a/automated/linux/ota-update/verify-reboot.sh b/automated/linux/ota-update/verify-reboot.sh
@@ -86,8 +86,12 @@ fiovb_is_secondary_boot_after_upgrade=$(uboot_variable_value "${SECONDARY_BOOT_V
 compare_test_value "fiovb_is_secondary_boot_after_upgrade" "${ref_fiovb_is_secondary_boot_after_upgrade}" "${fiovb_is_secondary_boot_after_upgrade}"
 
 if [ "${TYPE}" = "uboot" ]; then
-    uboot_variable_after_upgrade=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
-    compare_test_value "${TYPE}_uboot_variable_value_after_upgrade" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_after_upgrade}"
+    if [ -n "${U_BOOT_VARIABLE_NAME}" ]; then
+        uboot_variable_after_upgrade=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
+        compare_test_value "${TYPE}_uboot_variable_value_after_upgrade" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_after_upgrade}"
+    else
+        report_skip "${TYPE}_uboot_variable_value_after_upgrade"
+    fi
 fi
 . /etc/os-release
 # shellcheck disable=SC2154

diff --git a/automated/linux/ota-update/verify-update.sh b/automated/linux/ota-update/verify-update.sh
@@ -116,8 +116,12 @@ fiovb_is_secondary_boot_after_upgrade=$(uboot_variable_value "${SECONDARY_BOOT_V
 compare_test_value "fiovb_is_secondary_boot_after_upgrade" "${ref_fiovb_is_secondary_boot_after_upgrade}" "${fiovb_is_secondary_boot_after_upgrade}"
 
 if [ "${TYPE}" = "uboot" ]; then
-    uboot_variable_after_upgrade=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
-    compare_test_value "${TYPE}_uboot_variable_value_after_upgrade" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_after_upgrade}"
+    if [ -n "${U_BOOT_VARIABLE_NAME}" ]; then
+        uboot_variable_after_upgrade=$(uboot_variable_value "${U_BOOT_VARIABLE_NAME}")
+        compare_test_value "${TYPE}_uboot_variable_value_after_upgrade" "${U_BOOT_VARIABLE_VALUE}" "${uboot_variable_after_upgrade}"
+    else
+        report_skip "${TYPE}_uboot_variable_value_after_upgrade"
+    fi
 fi
 . /etc/os-release
 # shellcheck disable=SC2154