From 2fb8a26a7fc94a2944418bead0b0d4e2c1971dd9 Mon Sep 17 00:00:00 2001 From: Balaji Srinivasan Date: Wed, 21 Feb 2024 14:47:33 +0100 Subject: [PATCH] samples: https_client: Rename nRF91 specific overlay files The pdn and tfm overlay files are only applicable for the nRF91 series. They are now remamed to reflect the same. Readme updated. Additional build configuration added to ensure that the PDN overlay gets built by CI. Fixes CIA-1162. Signed-off-by: Balaji Srinivasan --- .../releases/release-notes-changelog.rst | 1 + samples/net/https_client/README.rst | 14 +++++++------- ...y-pdn_ipv4.conf => overlay-pdn-nrf91-ipv4.conf} | 0 ...lay-tfm_mbedtls.conf => overlay-tfm-nrf91.conf} | 0 samples/net/https_client/sample.yaml | 13 ++++++++++++- 5 files changed, 20 insertions(+), 8 deletions(-) rename samples/net/https_client/{overlay-pdn_ipv4.conf => overlay-pdn-nrf91-ipv4.conf} (100%) rename samples/net/https_client/{overlay-tfm_mbedtls.conf => overlay-tfm-nrf91.conf} (100%) diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 1ccc118dbdb4..f0b3fdcc8498 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -613,6 +613,7 @@ Networking samples * The format of the :file:`.pem` file to the pem format. * The sample to automatically convert the :file:`.pem` file to hex format so it can be included. * The sample to gracefully bring down the network interfaces. + * Renamed :file:`overlay-pdn_ipv4.conf` to :file:`overlay-pdn-nrf91-ipv4.conf` and :file:`overlay-tfm_mbedtls.conf` to :file:`overlay-tfm-nrf91.conf`. * :ref:`download_sample` sample: diff --git a/samples/net/https_client/README.rst b/samples/net/https_client/README.rst index 956d73510b58..56926c72873e 100644 --- a/samples/net/https_client/README.rst +++ b/samples/net/https_client/README.rst @@ -41,8 +41,8 @@ This certificate is provided in the :file:`samples/net/https_client/cert` folder To connect to other servers, you might need to provision a different certificate. See :ref:`cert_dwload` for more information. -Using Mbed TLS and TF-M -*********************** +Using Mbed TLS and TF-M on nRF91 Series DKs +******************************************* This sample supports using Mbed TLS and Trusted Firmware-M (TF-M). Instead of offloading the TLS sockets into the modem, you can use the Mbed TLS library from Zephyr. @@ -69,19 +69,19 @@ Building and running .. include:: /includes/build_and_run_ns.txt -To build the sample with Mbed TLS and TF-M, add the following to your west build command: +To build the sample with Mbed TLS and TF-M for the nRF91 Series DKs, add the following to your west build command: .. code-block:: none - -DOVERLAY_CONFIG=overlay-tfm_mbedtls.conf + -DOVERLAY_CONFIG=overlay-tfm-nrf91.conf The default packet data network (PDN) configuration is dual stack, which will use an IPv6 address if available (and IPv4 if not). -For testing IPv4 only, you might need to configure the packet data network settings, adding the following to your build command: +On the nRF91 Series DKs, for testing IPv4 only, you might need to configure the packet data network settings, adding the following to your build command: .. code-block:: none - -DOVERLAY_CONFIG=overlay-pdn_ipv4.conf + -DOVERLAY_CONFIG=overlay-pdn-nrf91-ipv4.conf Testing ======= @@ -136,7 +136,7 @@ Output for the default configuration, where the carrier does support IPv6: Finished, closing socket. PDP context 0 deactivated -Output where you override the default packet data network (PDN) configuration to IPv4 only, via the `overlay-pdn_ipv4.conf` overlay: +Output where you override the default packet data network (PDN) configuration to IPv4 only, using the ``overlay-pdn-nrf91-ipv4.conf`` overlay: .. code-block:: console diff --git a/samples/net/https_client/overlay-pdn_ipv4.conf b/samples/net/https_client/overlay-pdn-nrf91-ipv4.conf similarity index 100% rename from samples/net/https_client/overlay-pdn_ipv4.conf rename to samples/net/https_client/overlay-pdn-nrf91-ipv4.conf diff --git a/samples/net/https_client/overlay-tfm_mbedtls.conf b/samples/net/https_client/overlay-tfm-nrf91.conf similarity index 100% rename from samples/net/https_client/overlay-tfm_mbedtls.conf rename to samples/net/https_client/overlay-tfm-nrf91.conf diff --git a/samples/net/https_client/sample.yaml b/samples/net/https_client/sample.yaml index c78cf2ed68ca..0931e7f40605 100644 --- a/samples/net/https_client/sample.yaml +++ b/samples/net/https_client/sample.yaml @@ -14,7 +14,18 @@ tests: tags: ci_build sample.net.https_client.lte.tfm-mbedtls: build_only: true - extra_args: OVERLAY_CONFIG="overlay-tfm_mbedtls.conf" + extra_args: OVERLAY_CONFIG="overlay-tfm-nrf91.conf" + integration_platforms: + - nrf9160dk_nrf9160_ns + - nrf9161dk_nrf9161_ns + platform_allow: + - nrf9160dk_nrf9160_ns + - nrf9161dk_nrf9161_ns + - nrf9151dk_nrf9151_ns + tags: ci_build + sample.net.https_client.lte.pdn-ipv4: + build_only: true + extra_args: OVERLAY_CONFIG="overlay-pdn-nrf91-ipv4.conf" integration_platforms: - nrf9160dk_nrf9160_ns - nrf9161dk_nrf9161_ns