[nrf mergeup] Merge upstream automatically up to commit 4bbd91a908

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,10 +7,18 @@ assignees: ''
 
 ---
 
+**Notes (delete this)**
+Github Discussions (https://github.com/zephyrproject-rtos/zephyr/discussions)
+are available to first verify that the issue is a genuine Zephyr bug and not a
+consequence of Zephyr services misuse.
+
+This issue list is only for bugs in the main Zephyr code base
+(https://github.com/zephyrproject-rtos/zephyr/). If the bug is for a project
+fork (such as NCS) specific feature, please open an issue in the fork project
+instead.
+
 **Describe the bug**
 A clear and concise description of what the bug is.
-(Note that [Github Discussions](https://github.com/zephyrproject-rtos/zephyr/discussions) are available to first verify that the issue
-is a genuine Zephyr bug and not a consequence of Zephyr services misuse.)
 
 Please also mention any information which could help others to understand
 the problem you're facing:

.github/workflows/backport.yml

@@ -9,11 +9,23 @@ on:
 
 jobs:
   backport:
-    runs-on: ubuntu-20.04
     name: Backport
+    runs-on: ubuntu-22.04
+    # Only react to merged PRs for security reasons.
+    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+    if: >
+      github.event.pull_request.merged &&
+      (
+        github.event.action == 'closed' ||
+        (
+          github.event.action == 'labeled' &&
+          contains(github.event.label.name, 'backport')
+        )
+      )
     steps:
       - name: Backport
-        uses: zephyrproject-rtos/action-backport@v1.1.1-3
+        uses: zephyrproject-rtos/action-backport@v2.0.3-3
         with:
           github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
-          issue_labels: backport
+          issue_labels: Backport
+          labels_template: '["Backport"]'

.github/workflows/backport_issue_check.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   backport:
     name: Backport Issue Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:

.github/workflows/bsim-tests-bluetooth.yaml

@@ -0,0 +1,93 @@
+name: BabbleSim BT Tests
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/bsim-tests-bluetooth.yaml"
+      - ".github/workflows/bsim-tests-publish.yaml"
+      - "west.yml"
+      - "subsys/bluetooth/**"
+      - "tests/bsim/bluetooth/**"
+      - "samples/bluetooth/**"
+      - "boards/posix/**"
+      - "soc/posix/**"
+      - "arch/posix/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  bsim-test-bluetooth:
+    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on: zephyr-runner-linux-x64-4xlarge
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.1
+      options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      EDTT_PATH: ../tools/edtt
+      bsim_test_results_file: ./bsim_out/bsim_results.xml
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        GitHub comes up with a fundamental fix for this problem.
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: Clone cached Zephyr repository
+        continue-on-error: true
+        run: |
+          git clone --shared /github/cache/zephyrproject/zephyr .
+          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Environment Setup
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          rm -fr ".git/rebase-apply"
+          git rebase origin/${BASE_REF}
+          git log  --pretty=oneline | head -n 10
+          west init -l . || true
+          west config manifest.group-filter -- +ci
+          west config --global update.narrow true
+          west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
+          west forall -c 'git reset --hard HEAD'
+
+      - name: Run Bluetooth Tests with BSIM
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_out tests/bsim/bluetooth/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_test_results_file} \
+          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/run_parallel.sh
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: bsim-test-results
+          path: |
+            ./bsim_out/bsim_results.xml
+            ${{ github.event_path }}
+
+      - name: Upload Event Details
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: event
+          path: |
+            ${{ github.event_path }}

.github/workflows/bsim-tests-networking.yaml

@@ -0,0 +1,97 @@
+name: BabbleSim Networking Tests
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/bsim-tests-networking.yaml"
+      - ".github/workflows/bsim-tests-publish.yaml"
+      - "west.yml"
+      - "tests/bsim/net/**"
+      - "samples/net/sockets/echo_*/**"
+      - "modules/openthread/**"
+      - "subsys/net/l2/openthread/**"
+      - "include/zephyr/net/openthread.h"
+      - "boards/posix/**"
+      - "soc/posix/**"
+      - "arch/posix/**"
+      - "drivers/ieee802154/**"
+      - "include/zephyr/net/ieee802154*"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  bsim-test-networking:
+    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on: zephyr-runner-linux-x64-4xlarge
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.1
+      options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.0
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      EDTT_PATH: ../tools/edtt
+      bsim_test_results_file: ./bsim_out/bsim_results.xml
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        GitHub comes up with a fundamental fix for this problem.
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: Clone cached Zephyr repository
+        continue-on-error: true
+        run: |
+          git clone --shared /github/cache/zephyrproject/zephyr .
+          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Environment Setup
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          rm -fr ".git/rebase-apply"
+          git rebase origin/${BASE_REF}
+          git log  --pretty=oneline | head -n 10
+          west init -l . || true
+          west config manifest.group-filter -- +ci
+          west config --global update.narrow true
+          west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
+          west forall -c 'git reset --hard HEAD'
+
+      - name: Run Networking Tests with BSIM
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_out tests/bsim/net/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_test_results_file} \
+          SEARCH_PATH=tests/bsim/net/ tests/bsim/run_parallel.sh
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: bsim-test-results
+          path: |
+            ./bsim_out/bsim_results.xml
+            ${{ github.event_path }}
+
+      - name: Upload Event Details
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: event
+          path: |
+            ${{ github.event_path }}