Skip to content

Conversation

@tomchy
Copy link
Contributor

@tomchy tomchy commented Oct 27, 2025

Update sdk-zephyr and sdk-mcuboot revisions.

Ref: NCSDK-35821

@tomchy tomchy requested review from a team as code owners October 27, 2025 12:55
@NordicBuilder NordicBuilder added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 27, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 27, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff

All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 27, 2025

CI Information

To view the history of this post, click the 'edited' button above
Build number: 14

Inputs:

Sources:

sdk-nrf: PR head: f305f877e9097dfb870e9dc9058527e6c5e6b06e

more details

sdk-nrf:

PR head: f305f877e9097dfb870e9dc9058527e6c5e6b06e
merge base: ef91358aa74c03ba5aefce8d71d0a46bb8f81003
target head (main): ef91358aa74c03ba5aefce8d71d0a46bb8f81003
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (9)
modules
│  ├── mcuboot
│  │  │ Kconfig
samples
│  ├── dfu
│  │  ├── ab
│  │  │  │ prj.conf
│  ├── zephyr
│  │  ├── subsys
│  │  │  ├── mgmt
│  │  │  │  ├── mcumgr
│  │  │  │  │  ├── smp_svr
│  │  │  │  │  │  │ prj_requests.conf
scripts
│  ├── ci
│  │  │ license_allow_list.yaml
subsys
│  ├── mgmt
│  │  ├── mcumgr
│  │  │  ├── grp
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── img_mgmt
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ img_mgmt_state.c

Outputs:

Toolchain

Version: cfa6b06338
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:cfa6b06338_e595b21c39

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 545
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-sdk-find-my
    • ✅ test-sdk-mcuboot
    • ✅ test-sdk-dfu
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • desktop52_verification
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps-main
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread-main
    • test-low-level
    • test-sdk-audio
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@github-actions
Copy link

You can find the documentation preview for this PR here.

@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from 9b5adff to 6638616 Compare October 27, 2025 15:51
@tomchy tomchy requested a review from a team as a code owner October 27, 2025 15:51
@NordicBuilder NordicBuilder requested a review from a team October 27, 2025 15:52
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from 6638616 to 776e0b6 Compare October 28, 2025 17:28
@NordicBuilder NordicBuilder requested a review from a team October 28, 2025 17:29
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from 776e0b6 to 54ff202 Compare October 29, 2025 15:40
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from 54ff202 to 90927ea Compare October 31, 2025 10:54
@tomchy tomchy requested a review from a team as a code owner October 31, 2025 10:54
@NordicBuilder NordicBuilder added the doc-required PR must not be merged without tech writer approval. label Oct 31, 2025
@NordicBuilder NordicBuilder requested review from a team October 31, 2025 10:54
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch 2 times, most recently from 1a28bdd to bee1a89 Compare October 31, 2025 11:26
@tomchy tomchy removed doc-required PR must not be merged without tech writer approval. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 31, 2025
@NordicBuilder NordicBuilder added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Oct 31, 2025
@tomchy
Copy link
Contributor Author

tomchy commented Oct 31, 2025

Accidentally cherry-picked changes from #25307. Reverted to include only the change in Kconfig and west.yml.

@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from bee1a89 to eb83310 Compare November 3, 2025 08:23
Copilot AI review requested due to automatic review settings November 3, 2025 08:23
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates the sdk-zephyr and sdk-mcuboot dependencies to pull request branches for testing/review purposes, and adds a new Kconfig option for boot preference testing in MCUboot.

  • Updates sdk-zephyr revision from a commit SHA to pull/3429/head
  • Updates sdk-mcuboot revision from a commit SHA to pull/563/head
  • Adds NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE Kconfig option for testing boot preference with image test marking

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
west.yml Updates sdk-zephyr and sdk-mcuboot dependency revisions to pull request branches
modules/mcuboot/Kconfig Adds new Kconfig option for boot preference testing functionality

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@NordicBuilder NordicBuilder requested review from a team November 3, 2025 08:24
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from eb83310 to 61221fe Compare November 3, 2025 09:27
Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs change in scripts/ci/license_allow_list.yaml

@nordicjm
Copy link
Contributor

nordicjm commented Nov 3, 2025

also the commit adding the file needs to specify the zephyr commit ID the revision came from - note zephyr not sdk-zephyr

@tejlmand
Copy link
Contributor

tejlmand commented Nov 3, 2025

@tomchy please close auto created manifest PR #25253 if you don't need it.

@tomchy
Copy link
Contributor Author

tomchy commented Nov 3, 2025

@tomchy please close auto created manifest PR #25253 if you don't need it.

Looking at the current stage - the auto-PR will get merged sooner than this PR. This may give me a quicker turnarounds (less time waiting for the CI) if the new process of modifying zephyr files brings more comments from the reviewers.

@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from 61221fe to fcf3dc6 Compare November 3, 2025 09:46
Copilot AI review requested due to automatic review settings November 3, 2025 09:46
@NordicBuilder NordicBuilder requested review from a team November 3, 2025 09:47
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from fcf3dc6 to d3b7941 Compare November 3, 2025 09:49
Copilot AI review requested due to automatic review settings November 3, 2025 11:00
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from d3b7941 to 2e53220 Compare November 3, 2025 11:00
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@tomchy tomchy changed the title manifest: Update sdk-zephyr and sdk-mcuboot mgmt: Handle bootloader requests Nov 3, 2025
Move NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE since it is an
application Kconfig, not a bootloader one.

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Add a copy of the img_mgmt_state.c file, so it can be adjusted to work
with all NCS-specific extensions.

Zephyr revision: 25269118b5069ebb72316d2a26bdedbe6ba8de95

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Interpret pending active slot requests while calculating the expected
next slot to boot.

Signed-off-by: Tomasz Chyrowicz <[email protected]>
@tomchy tomchy force-pushed the bugfix/mcuboot/NCSDK-NONE_Confirm_requests branch from 2e53220 to f305f87 Compare November 3, 2025 13:12
@tomchy tomchy merged commit ac58534 into nrfconnect:main Nov 3, 2025
23 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants