Skip to content

Commit 367b962

Browse files
committed
ci: twister generates testplan.json
use json testplan, not CSV. Twister has migrated away from CSV. Signed-off-by: Anas Nashif <[email protected]>
1 parent 07b4362 commit 367b962

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/clang.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ jobs:
107107
python3 ./scripts/ci/test_plan.py --platform ${{ matrix.platform }} -c origin/${BASE_REF}..
108108
109109
# We can limit scope to just what has changed
110-
if [ -s testplan.csv ]; then
110+
if [ -s testplan.json ]; then
111111
echo "::set-output name=report_needed::1";
112112
# Full twister but with options based on changes
113-
./scripts/twister --inline-logs -M -N -v --load-tests testplan.csv --retry-failed 2
113+
./scripts/twister --inline-logs -M -N -v --load-tests testplan.json --retry-failed 2
114114
else
115115
# if nothing is run, skip reporting step
116116
echo "::set-output name=report_needed::0";

.github/workflows/twister.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
else
9191
echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
9292
fi
93-
rm -f testplan.csv .testplan
93+
rm -f testplan.json .testplan
9494
9595
- name: Determine matrix size
9696
id: output-services
@@ -226,11 +226,11 @@ jobs:
226226
- if: github.event_name == 'pull_request_target'
227227
name: Run Tests with Twister (Pull Request)
228228
run: |
229-
rm -f testplan.csv
229+
rm -f testplan.json
230230
export ZEPHYR_BASE=${PWD}
231231
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
232232
python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request
233-
./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.csv ${TWISTER_COMMON} ${PR_OPTIONS}
233+
./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.json ${TWISTER_COMMON} ${PR_OPTIONS}
234234
if [ "${{matrix.subset}}" = "1" -a ${{needs.twister-build-prep.outputs.fullrun}} = 'True' ]; then
235235
./scripts/zephyr_module.py --twister-out module_tests.args
236236
if [ -s module_tests.args ]; then
@@ -263,7 +263,7 @@ jobs:
263263
if-no-files-found: ignore
264264
path: |
265265
twister-out/twister.xml
266-
testplan.csv
266+
testplan.json
267267
268268
twister-test-results:
269269
name: "Publish Unit Tests Results"

0 commit comments

Comments
 (0)