Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions scripts/quarantine_zephyr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -252,24 +252,6 @@
- nrf7120dk/nrf7120/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31980"

- scenarios:
- sample.net.ocpp.tls
platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk@0.14.0/nrf9160/ns
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-39503"

- scenarios:
- net.coap.server.secure
platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf5340dk/nrf5340/cpuapp/ns
- nrf9160dk@0.14.0/nrf9160/ns
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-39505"

# --------------------------------- Won't fix section -----------------------------------

- scenarios:
Expand Down Expand Up @@ -334,7 +316,7 @@
- cpp.libcxx.glibcxx.newlib
- cpp.libcxx.glibcxx.newlib_nano
- cpp.libcxx.glibcxx.picolibc
- crypto.mbedtls_psa.without_entropy_driver
- crypto.psa.without_entropy_driver
- drivers.can.shell
- drivers.eeprom.shell
- drivers.gpio.build
Expand Down
6 changes: 3 additions & 3 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: a9f47784f568c8b4ede9e3b6ea53758e5a391c93
revision: 6086d15e0350f5c3359a9500ef80cea23fc9f8b2
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -139,11 +139,11 @@ manifest:
- name: mbedtls
path: modules/crypto/mbedtls
repo-path: sdk-mbedtls
revision: 92d44566209a0d94a571cc7f71a4a7b9262f7602
revision: 5b7ca76723b3aa77a9ab066e552fe0dca4975f45
- name: oberon-psa-crypto
path: modules/crypto/oberon-psa-crypto
repo-path: sdk-oberon-psa-crypto
revision: 3a9005029dae919e3f6d9d4182465a8e2572cf9f
revision: ce39726a33b6263b8a006ba404f78b209be1806c
- name: nrfxlib
repo-path: sdk-nrfxlib
path: nrfxlib
Expand Down
Loading