freertos-integration-tests: Remove OTA update dependencies

Since we don't run OTA tests as part of the intgeration tests
anymore, we don't need to sign the update binary and there
is no need to upload the update binary to AWS.

Signed-off-by: Ahmed Ismail <[email protected]>

Author: AhmedIsmail02

applications/freertos_iot_libraries_tests/CMakeLists.txt

@@ -6,21 +6,7 @@ cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)
 
 set(AWS_OTA_SIGNATURE_TYPE  "RSA-3072" CACHE STRING "Supported algorithms for signature validation [RSA-2048, RSA-3072, EC-P256, EC-P384]")
 
-# From: ota-for-aws-iot-embedded-sdk/source/include/ota_appversion32.h
-# struct version
-# {
-#     uint8_t major;  /*!< @brief Major version number of the firmware (X in firmware version X.Y.Z). */
-#     uint8_t minor;  /*!< @brief Minor version number of the firmware (Y in firmware version X.Y.Z). */
-#
-#     uint16_t build; /*!< @brief Build of the firmware (Z in firmware version X.Y.Z). */
-# } x;                /*!< @brief Version number of the firmware. */
-
-# AWS OTA client does not use the SemVer PATCH version.
-# Because of this, if only PATCH version is changed then the OTA will be rejected
-# due to same firmware version.
-# We will therefore change the build version from TF-M.
 set(MCUBOOT_IMAGE_VERSION_NS "0.0.1+10")
-set(MCUBOOT_IMAGE_VERSION_NS_UPDATE "0.0.1+20")
 set(MCUBOOT_IMAGE_NUMBER 2 CACHE STRING "Total number of firmware images")
 set(DEFAULT_MCUBOOT_FLASH_MAP ON)
 
@@ -56,7 +42,6 @@ list(APPEND CMAKE_MODULE_PATH ${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/compon
 list(APPEND CMAKE_MODULE_PATH ${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/components/security/trusted_firmware-m/integration/cmake)
 include(SetLinkerOptions)
 include(AWSIoTHelpers)
-include(GenerateAWSUpdateDigestAndSignature)
 include(MergeTfmImages)
 include(SignTfmImage)
 
@@ -110,7 +95,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         freertos-ota-pal-psa
         fri-bsp
         helpers-events
-        ota-update
         provisioning-lib
         mbedtls
         tfm-ns-interface
@@ -139,18 +123,6 @@ iot_reference_arm_corstone3xx_tf_m_sign_image(
     TRUE
 )
 
-# The update image is not padded to fill the whole slot (no --pad), because
-# 1) the image to download is smaller without padding
-# 2) the trailer that keeps track of boot and update statuses should not be overwritten
-iot_reference_arm_corstone3xx_tf_m_sign_image(
-    ${CMAKE_PROJECT_NAME}
-    "ns_image"
-    ${CMAKE_PROJECT_NAME}-update_signed
-    ${MCUBOOT_IMAGE_VERSION_NS_UPDATE}
-    "${BINARY_DIR}/api_ns/image_signing/layout_files/signing_layout_ns.o"
-    FALSE
-)
-
 # A user project that consumes the ARM FRI needs to explicitly provide
 # addresses in order to merge images for TF-M. The addresses cannot
 # be easily programmatically extracted as they are defined in the linker
@@ -160,11 +132,3 @@ iot_reference_arm_corstone3xx_tf_m_merge_images(
     ${NS_PROVISIONING_BUNDLE_LOAD_ADDRESS}
     ${CMAKE_BINARY_DIR}/helpers/provisioning/provisioning_data.bin
 )
-
-# Generate the AWS OTA update digest and signature
-iot_reference_arm_corstone3xx_generate_aws_update_digest_and_signature(
-    ${CMAKE_PROJECT_NAME}
-    ${CMAKE_PROJECT_NAME}-update_signed
-    update-digest
-    update-signature
-)

tools/tests/test_integration.py

@@ -1,10 +1,8 @@
-# Copyright (c) 2023-2024 Arm Limited. All rights reserved.
+# Copyright (c) 2023-2025 Arm Limited. All rights reserved.
 # SPDX-License-Identifier: MIT
 
 import subprocess
 from timeit import default_timer as timer
-from pytest import fixture
-from aws_test_util import Flags, create_aws_resources, cleanup_aws_resources
 import re
 
 # If you have failing test cases to ignore,
@@ -17,33 +15,7 @@
 test_cases_to_ignore = {}
 
 
-@fixture(scope="function")
-def setup_resources(
-    build_artefacts_path: str,
-    credentials_path: str,
-    signed_update_bin_name: str,
-    signing_algo: str,
-):
-    """
-    Setup resources needed to run the test.
-
-    build_artefacts_path: Path to all the artefacts needed to create AWS resources.
-    credentials_path: Path to AWS credentials.
-    signed_update_bin_name: Name of the binary to be used for the OTA update.
-    """
-    flags = Flags(
-        build_artefacts_path, credentials_path, signed_update_bin_name, signing_algo
-    )
-    flags = create_aws_resources(flags)
-    try:
-        # Caller won't actually do anything with this, but we have to yield something.
-        yield flags
-    finally:
-        cleanup_aws_resources(flags)
-
-
 def test_integration(
-    setup_resources,
     fvp_process: subprocess.Popen,
     timeout_seconds: int,
 ):