chore(update-ncs): update to NCS 2.6.99 (#20)

### Summary

Update internal dogfood branch to latest NCS.

### Test Plan

Performed the merge locally and confirmed
successful build with asset tracker app.

---
Resolves: MCU-298

Author: gminn

.github/test-spec.yml

@@ -198,13 +198,23 @@
   - any:
       - "include/bluetooth/**/*"
       - "!include/bluetooth/mesh/**/*"
-  - any:
-      - "samples/bluetooth/**/*"
-      - "!samples/bluetooth/mesh/**/*"
   - "subsys/nrf_rpc/**/*"
   - "subsys/mpsl/**/*"
   - "drivers/mpsl/**/*"
 
+"CI-ble-samples-test":
+  - "samples/bluetooth/**/*"
+  - "subsys/nrf_rpc/**/*"
+  - "subsys/mpsl/**/*"
+  - "drivers/mpsl/**/*"
+  - any:
+      - "subsys/bluetooth/**/*"
+      - "!subsys/bluetooth/mesh/**/*"
+  - any:
+      - "include/bluetooth/**/*"
+      - "!include/bluetooth/mesh/**/*"
+
+
 "CI-mesh-test":
   - "subsys/bluetooth/mesh/**/*"
   - "include/bluetooth/mesh/**/*"
@@ -273,6 +283,7 @@
   - "include/nrf_profiler.h"
   - "scripts/hid_configurator/**/*"
   - "subsys/bluetooth/services/**/*"
+  - "subsys/bluetooth/adv_prov/**/*"
   - "subsys/bluetooth/*"
   - "subsys/caf/**/*"
   - "subsys/app_event_manager/**/*"

.github/workflows/docbuild.yml

@@ -71,10 +71,10 @@ jobs:
         working-directory: ncs/nrf
         run: |
           MONITOR="monitor_${{ github.run_id }}.txt"
-          ARCHIVE="doc_build_${{ github.run_id }}.zip"
 
           # Create documentation upload files
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            ARCHIVE="doc_build_pr_${{ github.event.number }}.zip"
             echo "publish2 dev PR-${{ github.event.number }} ${ARCHIVE}" > "${MONITOR}"
             echo "${{ github.event.number }}" > pr.txt
           else
@@ -87,6 +87,7 @@ jobs:
               echo "Not a release or latest, skipping publish"
               exit 0
             fi
+            ARCHIVE="doc_build_${VERSION}.zip"
             echo "publish2 main ${VERSION} ${ARCHIVE}" > "${MONITOR}"
           fi
 

.github/workflows/docker.yml

@@ -20,8 +20,8 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: NordicBuilder
+          password: ${{ secrets.NCS_GITHUB_PKG_WRITE_TOKEN }}
 
       - name: Build and push Docker image
         run: |

.github/workflows/labeler.yml

@@ -9,3 +9,4 @@ jobs:
       - uses: actions/[email protected]
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          sync-labels: true

.github/workflows/oss-history.yml

@@ -31,4 +31,4 @@ jobs:
         uses: nrfconnect/action-oss-history@main
         with:
           workspace: 'ncs'
-          args: -p zephyr -p mcuboot -p trusted-firmware-m -p hostap -p wfa-qt-control-app
+          args: -p zephyr -p mcuboot -p hostap -p wfa-qt-control-app

.github/workflows/reapply-ci-trusted-author.yml

@@ -1,4 +1,6 @@
 name: Reapply CI-trusted-author label
+# We want to use NordicBuilder instead of github-actions[bot] user
+# github-actions[bot] is not trusted collaborator and labels added by it does not trigger Jenkins builds
 
 on:
   pull_request_target:
@@ -13,11 +15,11 @@ jobs:
       - name: Remove CI-trusted-author label
         run: gh pr edit ${{ github.event.pull_request.number }} --remove-label "CI-trusted-author"
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.NCS_JENKINS_TOKEN }}
           GH_REPO: ${{ github.repository }}
 
       - name: Add CI-trusted-author label
         run: gh pr edit ${{ github.event.pull_request.number }} --add-label "CI-trusted-author"
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.NCS_JENKINS_TOKEN }}
           GH_REPO: ${{ github.repository }}

CODEOWNERS

@@ -30,6 +30,7 @@
 # Applications
 /applications/asset_tracker_v2/           @nrfconnect/ncs-cia @coderbyheart
 /applications/connectivity_bridge/        @nrfconnect/ncs-cia @nordic-auko
+/applications/ipc_radio/                  @dchat-nordic
 /applications/machine_learning/           @pdunaj
 /applications/matter_bridge/              @Damian-Nordic @kkasperczyk-no
 /applications/matter_weather_station/     @Damian-Nordic @kkasperczyk-no
@@ -73,6 +74,8 @@ Kconfig*                                  @tejlmand
 /doc/nrf/security/                        @greg-fer
 /doc/nrf/test_and_optimize/               @greg-fer
 /doc/nrf/*.rst                            @greg-fer
+# Protocols related docs
+/doc/nrf/protocols/thread/*.rst           @wiba-nordic
 # All subfolders
 /drivers/                                 @anangl
 /drivers/serial/                          @nordic-krch @anangl
@@ -83,13 +86,12 @@ Kconfig*                                  @tejlmand
 /drivers/wifi/nrf700x/                    @krish2718 @sachinthegreen @rado17 @rlubos
 /dts/                                     @anangl
 /ext/                                     @carlescufi
-/ext/oberon/                              @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
 /include/                                 @anangl @rlubos
 /include/net/azure_*                      @nrfconnect/ncs-cia @coderbyheart
 /include/net/wifi_credentials.h           @nrfconnect/ncs-cia
 /include/net/nrf_cloud_*                  @plskeggs @jayteemo @glarsennordic
 /include/bluetooth/                       @alwa-nordic @jori-nordic @KAGA164
-/include/bluetooth/services/fast_pair.h   @alstrzebonski @MarekPieta @kapi-no
+/include/bluetooth/services/fast_pair/    @alstrzebonski @MarekPieta @kapi-no
 /include/bluetooth/adv_prov.h             @MarekPieta @kapi-no @KAGA164
 /include/bluetooth/mesh/                  @ludvigsj
 /include/caf/                             @pdunaj
@@ -198,10 +200,13 @@ Kconfig*                                  @tejlmand
 /samples/wifi/scan/                       @D-Triveni @bama-nordic
 /samples/wifi/shell/                      @krish2718 @sachinthegreen @rado17 @rlubos
 /samples/wifi/sta/                        @D-Triveni @bama-nordic
-/samples/wifi/sr_coex/                    @muraliThokala @bama-nordic
+/samples/wifi/ble_coex/                   @muraliThokala @bama-nordic
 /samples/wifi/shutdown/                   @krish2718 @sachinthegreen
 /samples/wifi/twt/                        @chiranjeevi2776 @krish2718
 /samples/wifi/throughput/                 @SusanGRapaka @D-Triveni
+/samples/wifi/raw_tx_packet/              @D-Triveni
+/samples/wifi/softap/                     @D-Triveni @krish2718
+/samples/wifi/monitor/                    @chiranjeevi2776 @krish2718
 /scripts/                                 @tejlmand @nrfconnect/ncs-test-leads
 /scripts/hid_configurator/                @MarekPieta
 /scripts/tools-versions-*.txt             @tejlmand @grho @shanthanordic @ihansse
@@ -213,6 +218,7 @@ Kconfig*                                  @tejlmand
 /scripts/print_toolchain_checksum.sh      @nrfconnect/ncs-ci
 /share/zephyrbuild-package/               @tejlmand
 /share/ncs-package/                       @tejlmand
+/snippets/nrf91-modem-trace-ext-flash/    @nrfconnect/ncs-cia
 /snippets/nrf91-modem-trace-uart/         @eivindj-nordic
 /snippets/tfm-enable-share-uart/          @nrfconnect/ncs-cia
 /snippets/nrf70-debug/                    @krish2718 @sachinthegreen
@@ -261,7 +267,8 @@ Kconfig*                                  @tejlmand
 /subsys/nrf_profiler/                     @pdunaj
 /subsys/shell/                            @nordic-krch
 /subsys/nrf_security/                     @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/subsys/secure_storage/                   @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
+/subsys/trusted_storage/                  @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
+/subsys/uart_async_adapter/               @rakons
 /subsys/net_core_monitor/                 @maje-emb
 /subsys/zigbee/                           @milewr
 /tests/                                   @PerMac @katgiadla

VERSION

@@ -1 +1 @@
-2.5.99
+2.6.99

applications/asset_tracker_v2/CMakeLists.txt

@@ -30,16 +30,19 @@ add_subdirectory_ifdef(CONFIG_WATCHDOG_APPLICATION src/watchdog)
 # Include nRF modem library header file for PC builds.
 # These are used throughout the application in type definitions.
 if (CONFIG_BOARD_QEMU_X86 OR CONFIG_BOARD_NATIVE_POSIX)
-        target_include_directories(app PRIVATE ${NRFXLIB_DIR}/nrf_modem/include/)
+	target_include_directories(app PRIVATE ${NRFXLIB_DIR}/nrf_modem/include/)
 
-        # Make folder containing certificates global so that it can be located by the configured
-        # cloud library.
-        zephyr_include_directories(src/cloud-certs)
+	# Make the folder that contains the certificates global so that it can be located by the
+	# nRF Cloud library. For the other clouds integrations, the certificates are handled by the
+	# MQTT helper library, see CONFIG_MQTT_HELPER_PROVISION_CERTIFICATES.
+	if (CONFIG_NRF_CLOUD_PROVISION_CERTIFICATES)
+		zephyr_include_directories(src/cloud-certs)
+	endif()
 
-        target_compile_options(app PRIVATE
-	        -DCONFIG_LTE_NEIGHBOR_CELLS_MAX=10)
+	target_compile_options(app PRIVATE
+		-DCONFIG_LTE_NEIGHBOR_CELLS_MAX=10)
 endif()
 
 if(CONFIG_ASSET_TRACKER_V2_LTO)
-        target_compile_options(app PRIVATE "-flto")
+	target_compile_options(app PRIVATE "-flto")
 endif()

applications/asset_tracker_v2/boards/native_sim.conf

@@ -116,3 +116,6 @@ CONFIG_BUILD_S1_VARIANT=n
 
 # Watchdog
 CONFIG_WATCHDOG_APPLICATION=n
+
+# Cloud module certificates
+CONFIG_MQTT_HELPER_CERTIFICATES_FOLDER="src/cloud-certs"