tests: on_target: add ppk test

DematteisGiacomo · DematteisGiacomo · commit d12fd0f5f62b · 2024-11-19T09:08:19.000+01:00
Add ppk test and update nightly badge accordingly.
Also, add html interactive power plot, hosted on github pages.

Signed-off-by: Giacomo Dematteis &lt;giacomo.dematteis@nordicsemi.no&gt;
diff --git a/.github/workflows/on_target.yml b/.github/workflows/on_target.yml
@@ -19,7 +19,7 @@ on:
         default: true
       run_fullmfwfota_test:
         type: boolean
-        required: true
+        required: false
         default: false
       run_dfu_tests:
         type: boolean
@@ -29,6 +29,18 @@ on:
         type: boolean
         required: false
         default: true
+      run_wifi_location_tests:
+        type: boolean
+        required: false
+        default: true
+      run_modem_trace_tests:
+        type: boolean
+        required: false
+        default: true
+      run_ppk_tests:
+        type: boolean
+        required: false
+        default: false
   workflow_dispatch:
     inputs:
       artifact_fw_version:
@@ -59,11 +71,25 @@ on:
         type: boolean
         required: true
         default: false
+      run_wifi_location_tests:
+        type: boolean
+        required: true
+        default: false
+      run_modem_trace_tests:
+        type: boolean
+        required: true
+        default: false
+      run_ppk_tests:
+        type: boolean
+        required: true
+        default: false
 
 jobs:
   target_test:
     name: Target Test
     runs-on: self-hosted
+    permissions:
+      contents: write
     environment: production
     container:
       image: ghcr.io/hello-nrfcloud/firmware:docker-v1.0.3
@@ -183,6 +209,7 @@ jobs:
           LOG_FILENAME: oob_conn_bridge_test_log
 
       - name: Run Wi-Fi location tests
+        if: ${{ inputs.run_wifi_location_tests }}
         working-directory: thingy91x-oob/tests/on_target
         run: |
           mkdir -p results
@@ -193,6 +220,7 @@ jobs:
           SEGGER: ${{ secrets.SEGGER_DUT_1 }}
 
       - name: Run modem trace test
+        if: ${{ inputs.run_modem_trace_tests }}
         working-directory: thingy91x-oob/tests/on_target
         run: |
           mkdir -p results
@@ -202,6 +230,76 @@ jobs:
         env:
           SEGGER: ${{ secrets.SEGGER_DUT_1 }}
 
+      - name: Run PPK tests
+        if: ${{ inputs.run_ppk_tests }}
+        id: ppk_test
+        working-directory: thingy91x-oob/tests/on_target
+        run: |
+          mkdir -p results
+          pytest -s -v -m dut_ppk \
+            --junit-xml=results/test-results-ppk.xml \
+            tests
+        env:
+          SEGGER: ${{ secrets.SEGGER_DUT_PPK }}
+
+      - name: Commit and Push Badge File to gh-pages Branch
+        if: always()
+        working-directory: thingy91x-oob
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Define file paths as variables
+          BADGE_FILE=tests/on_target/power_badge.json
+          HTML_FILE=tests/on_target/power_measurements_plot.html
+          CSV_FILE=tests/on_target/power_measurements.csv
+
+          # Check if the badge file exists at the specified location
+          if [ -f $BADGE_FILE ]; then
+            echo "Badge file found, proceeding to commit."
+          else
+            echo "Badge file not found. Exiting..."
+            exit 1
+          fi
+
+          # Check if the html file exists at the specified location
+          if [ -f $HTML_FILE ]; then
+            echo "Html file found, proceeding to commit."
+          else
+            echo "Html file not found. Exiting..."
+            exit 1
+          fi
+
+          # Check if the csv file exists at the specified location
+          if [ -f $CSV_FILE ]; then
+            echo "Csv file found, proceeding to commit."
+          else
+            echo "Csv file not found. Exiting..."
+            exit 1
+          fi
+
+          # Configure Git to trust the current working directory
+          git config --global --add safe.directory /__w/firmware/firmware
+
+          # Set Git user name and email for commits in the GitHub Actions environment
+          git config --global user.email "github-actions@github.com"
+          git config --global user.name "GitHub Actions"
+
+          # Ensure the gh-pages branch exists and switch to it
+          git fetch origin gh-pages || git checkout -b gh-pages
+          git checkout gh-pages
+
+          # Stage, commit, and push changes to the branch
+          echo ls tests/on_target/
+          ls tests/on_target/
+          echo ls docs/
+          ls docs/
+          cp $BADGE_FILE docs/power_badge.json
+          cp $HTML_FILE docs/power_measurements_plot.html
+          cp $CSV_FILE docs/power_measurements.csv
+          git add docs/power_badge.json docs/power_measurements_plot.html docs/power_measurements.csv
+          git commit -m "Update power badge, html and csv to docs folder"
+          git push origin gh-pages
+
       - name: Results
         if: always()
         uses: pmeier/pytest-results-action@v0.7.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,6 +19,18 @@ on:
         type: boolean
         required: true
         default: true
+      run_wifi_location_tests:
+        type: boolean
+        required: true
+        default: true
+      run_modem_trace_tests:
+        type: boolean
+        required: true
+        default: true
+      run_ppk_tests:
+        type: boolean
+        required: true
+        default: false
   schedule:
     - cron: "0 0 * * *"
   push:
@@ -67,3 +79,20 @@ jobs:
           github.event_name == 'push' ||
           (github.event_name == 'workflow_dispatch' && github.event.inputs.run_connectivity_bridge_tests == 'true')
         }}
+      run_wifi_location_tests: >-
+        ${{
+            github.event_name == 'schedule' ||
+            github.event_name == 'push' ||
+            (github.event_name == 'workflow_dispatch' && github.event.inputs.run_wifi_location_tests == 'true')
+        }}
+      run_modem_trace_tests: >-
+        ${{
+          github.event_name == 'schedule' ||
+          github.event_name == 'push' ||
+          (github.event_name == 'workflow_dispatch' && github.event.inputs.run_modem_trace_tests == 'true')
+        }}
+      run_ppk_tests: >-
+        ${{
+            github.event_name == 'schedule' ||
+            (github.event_name == 'workflow_dispatch' && github.event.inputs.run_ppk_tests == 'true')
+        }}
diff --git a/README.md b/README.md
@@ -7,6 +7,8 @@
 
 #### Nightly:
 [![Target_tests](https://github.com/hello-nrfcloud/firmware/actions/workflows/test.yml/badge.svg?event=schedule)](https://github.com/hello-nrfcloud/firmware/actions/workflows/test.yml?query=branch%3Amain+event%3Aschedule)
+[![Power Consumption Badge](https://img.shields.io/endpoint?url=https://hello-nrfcloud.github.io/firmware/power_badge.json)](https://hello-nrfcloud.github.io/firmware/power_measurements_plot.html)
+
 
 This project is based on the
 [NCS Example Application](https://github.com/nrfconnect/ncs-example-application).
diff --git a/tests/on_target/tests/conftest.py b/tests/on_target/tests/conftest.py
@@ -102,7 +102,7 @@ def t91x_traces(t91x_board):
 def hex_file():
     # Search for the firmware hex file in the artifacts folder
     artifacts_dir = "artifacts"
-    hex_pattern = r"hello\.nrfcloud\.com-[a-f0-9]+-thingy91x-nrf91\.hex"
+    hex_pattern = r"hello\.nrfcloud\.com-[a-z.0-9]+-thingy91x-nrf91\.hex"
 
     for file in os.listdir(artifacts_dir):
         if re.match(hex_pattern, file):
diff --git a/tests/on_target/tests/test_power.py b/tests/on_target/tests/test_power.py
