Skip to content

Commit 546f299

Browse files
DematteisGiacomoDematteisGiacomo
committed
workflows: target-test: fix matrix
IF statements are not allowed at matrix level, only at job level. Signed-off-by: Giacomo Dematteis <giacomo.dematteis@nordicsemi.no>
1 parent 330e775 commit 546f299

File tree

1 file changed

+86
-86
lines changed

1 file changed

+86
-86
lines changed

‎.github/workflows/target-test.yml‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ jobs:
4343
strategy:
4444
fail-fast: false # Don't fail all jobs if one fails
4545
matrix:
46-
include:
47-
- device: cia-trd-thingy91x
48-
- device: ppk_thingy91x
49-
if: ${{ inputs.pytest_marker == '' || inputs.pytest_marker == 'no_markers_flag' || inputs.pytest_marker == 'slow' }}
46+
device:
47+
- cia-trd-thingy91x
48+
- ppk_thingy91x
5049

5150
# Self-hosted runner is labeled according to the device it is linked with
5251
runs-on: ${{ matrix.device }}
5352
name: Target Test - ${{ matrix.device }}
53+
if: ${{ matrix.device != 'ppk_thingy91x' }} || ${{ inputs.pytest_marker == '' }} || ${{ inputs.pytest_marker == 'no_markers_flag' }} || ${{ inputs.pytest_marker == 'slow' }}
5454

5555
permissions:
5656
actions: read
@@ -95,85 +95,85 @@ jobs:
9595
run: |
9696
pip install -r requirements.txt --break-system-packages
9797
98-
- name: Upload symbol file to Memfault
99-
working-directory: asset-tracker-template/tests/on_target/artifacts
100-
run: |
101-
memfault \
102-
--org-token ${{ secrets.MEMFAULT_ORGANIZATION_TOKEN }} \
103-
--org ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} \
104-
--project ${{ vars.MEMFAULT_PROJECT_SLUG }} \
105-
upload-mcu-symbols \
106-
--software-type asset-tracker-template-ci \
107-
--software-version ${{ inputs.artifact_fw_version }} \
108-
asset-tracker-template-${{ inputs.artifact_fw_version }}-thingy91x-nrf91.elf
109-
110-
- name: Target Tests
111-
working-directory: asset-tracker-template/tests/on_target
112-
run: |
113-
mkdir -p results
114-
115-
if [[ '${{ inputs.pytest_marker }}' == 'no_markers_flag' || '${{ inputs.pytest_marker }}' == '' ]]; then
116-
pytest_marker_arg=()
117-
else
118-
pytest_marker_arg=(-m "${{ inputs.pytest_marker }}")
119-
fi
120-
echo pytest -v "${pytest_marker_arg[@]}"
121-
122-
if [[ '${{ matrix.device }}' == 'ppk_thingy91x' ]]; then
123-
# For PPK device, only run tests/test_ppk
124-
pytest -v "${pytest_marker_arg[@]}" \
125-
--junit-xml=results/test-results.xml \
126-
--html=results/test-results.html --self-contained-html \
127-
tests/test_ppk
128-
else
129-
pytest -v "${pytest_marker_arg[@]}" \
130-
--junit-xml=results/test-results.xml \
131-
--html=results/test-results.html --self-contained-html \
132-
--ignore=tests/test_ppk \
133-
${{ inputs.pytest_path }}
134-
fi
135-
shell: bash
136-
env:
137-
SEGGER: ${{ env.RUNNER_SERIAL_NUMBER }}
138-
UUID: ${{ env.UUID }}
139-
NRFCLOUD_API_KEY: ${{ secrets.NRF_CLOUD_API_KEY }}
140-
LOG_FILENAME: att_test_log
141-
TEST_REPORT_NAME: ATT Firwmare Test Report
142-
MEMFAULT_ORGANIZATION_TOKEN: ${{ secrets.MEMFAULT_ORGANIZATION_TOKEN }}
143-
MEMFAULT_ORGANIZATION_SLUG: ${{ vars.MEMFAULT_ORGANIZATION_SLUG }}
144-
MEMFAULT_PROJECT_SLUG: ${{ vars.MEMFAULT_PROJECT_SLUG }}
145-
146-
- name: Commit and Push Badge File to gh-pages Branch
147-
if: always()
148-
continue-on-error: true
149-
working-directory: asset-tracker-template
150-
env:
151-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
152-
run: ./tests/on_target/scripts/commit_badge.sh
153-
154-
- name: Results
155-
if: always()
156-
uses: pmeier/pytest-results-action@v0.7.1
157-
with:
158-
path: asset-tracker-template/tests/on_target/results/*.xml
159-
summary: true
160-
fail-on-empty: true
161-
title: ATT FW Test Results
162-
163-
- name: Create Report Artifact
164-
if: always()
165-
uses: actions/upload-artifact@v4
166-
id: artifact-report
167-
with:
168-
name: test-report-${{ matrix.device }}
169-
path: |
170-
asset-tracker-template/tests/on_target/results/*.html
171-
172-
- name: Push log files to artifacts
173-
if: always()
174-
uses: actions/upload-artifact@v4
175-
id: artifact-upload-test-logs
176-
with:
177-
name: test-logs-${{ matrix.device }}
178-
path: |
179-
asset-tracker-template/tests/on_target/outcomes/logs/*.txt
98+
# - name: Upload symbol file to Memfault
99+
# working-directory: asset-tracker-template/tests/on_target/artifacts
100+
# run: |
101+
# memfault \
102+
# --org-token ${{ secrets.MEMFAULT_ORGANIZATION_TOKEN }} \
103+
# --org ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} \
104+
# --project ${{ vars.MEMFAULT_PROJECT_SLUG }} \
105+
# upload-mcu-symbols \
106+
# --software-type asset-tracker-template-ci \
107+
# --software-version ${{ inputs.artifact_fw_version }} \
108+
# asset-tracker-template-${{ inputs.artifact_fw_version }}-thingy91x-nrf91.elf
109+
110+
# - name: Target Tests
111+
# working-directory: asset-tracker-template/tests/on_target
112+
# run: |
113+
# mkdir -p results
114+
115+
# if [[ '${{ inputs.pytest_marker }}' == 'no_markers_flag' || '${{ inputs.pytest_marker }}' == '' ]]; then
116+
# pytest_marker_arg=()
117+
# else
118+
# pytest_marker_arg=(-m "${{ inputs.pytest_marker }}")
119+
# fi
120+
# echo pytest -v "${pytest_marker_arg[@]}"
121+
122+
# if [[ '${{ matrix.device }}' == 'ppk_thingy91x' ]]; then
123+
# # For PPK device, only run tests/test_ppk
124+
# pytest -v "${pytest_marker_arg[@]}" \
125+
# --junit-xml=results/test-results.xml \
126+
# --html=results/test-results.html --self-contained-html \
127+
# tests/test_ppk
128+
# else
129+
# pytest -v "${pytest_marker_arg[@]}" \
130+
# --junit-xml=results/test-results.xml \
131+
# --html=results/test-results.html --self-contained-html \
132+
# --ignore=tests/test_ppk \
133+
# ${{ inputs.pytest_path }}
134+
# fi
135+
# shell: bash
136+
# env:
137+
# SEGGER: ${{ env.RUNNER_SERIAL_NUMBER }}
138+
# UUID: ${{ env.UUID }}
139+
# NRFCLOUD_API_KEY: ${{ secrets.NRF_CLOUD_API_KEY }}
140+
# LOG_FILENAME: att_test_log
141+
# TEST_REPORT_NAME: ATT Firwmare Test Report
142+
# MEMFAULT_ORGANIZATION_TOKEN: ${{ secrets.MEMFAULT_ORGANIZATION_TOKEN }}
143+
# MEMFAULT_ORGANIZATION_SLUG: ${{ vars.MEMFAULT_ORGANIZATION_SLUG }}
144+
# MEMFAULT_PROJECT_SLUG: ${{ vars.MEMFAULT_PROJECT_SLUG }}
145+
146+
# - name: Commit and Push Badge File to gh-pages Branch
147+
# if: always()
148+
# continue-on-error: true
149+
# working-directory: asset-tracker-template
150+
# env:
151+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
152+
# run: ./tests/on_target/scripts/commit_badge.sh
153+
154+
# - name: Results
155+
# if: always()
156+
# uses: pmeier/pytest-results-action@v0.7.1
157+
# with:
158+
# path: asset-tracker-template/tests/on_target/results/*.xml
159+
# summary: true
160+
# fail-on-empty: true
161+
# title: ATT FW Test Results
162+
163+
# - name: Create Report Artifact
164+
# if: always()
165+
# uses: actions/upload-artifact@v4
166+
# id: artifact-report
167+
# with:
168+
# name: test-report-${{ matrix.device }}
169+
# path: |
170+
# asset-tracker-template/tests/on_target/results/*.html
171+
172+
# - name: Push log files to artifacts
173+
# if: always()
174+
# uses: actions/upload-artifact@v4
175+
# id: artifact-upload-test-logs
176+
# with:
177+
# name: test-logs-${{ matrix.device }}
178+
# path: |
179+
# asset-tracker-template/tests/on_target/outcomes/logs/*.txt

0 commit comments

Comments
 (0)