Skip to content

Commit d56d80d

Browse files
committed
refactor(ci/lava-test): Hardcode targets
The logic computing the list of targets is a bit hairy and makes it harder to intersect the list of boards that a build targets with the list of boards/job templates that are in the tree. Hardcode the list of targets to simplify overall logic. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
1 parent 700d9cc commit d56d80d

File tree

1 file changed

+15
-45
lines changed

1 file changed

+15
-45
lines changed

.github/workflows/lava-test.yml

Lines changed: 15 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -16,67 +16,37 @@ permissions:
1616

1717
env:
1818
BUILD_URL: ${{ inputs.url }}
19-
LAVA_CI: ci/lava/
2019

2120
jobs:
22-
prepare-job-list:
23-
runs-on: ubuntu-latest
24-
outputs:
25-
jobmatrix: ${{ steps.listjobs.outputs.jobmatrix }}
26-
steps:
27-
- name: Clone repository
28-
uses: actions/checkout@v4
29-
with:
30-
fetch-depth: 0
31-
- name: Print trigger
32-
run: |
33-
echo "Triggered by ${{ github.event_name }}"
34-
echo "Build URL: $BUILD_URL"
35-
- name: "List jobs"
36-
id: listjobs
37-
run: |
38-
# json with display names and relative filenames to LAVA templates
39-
J=$(find "${LAVA_CI}" -name '*.yaml' -print0 |
40-
jq --compact-output --raw-input --slurp '
41-
# split null-delimited list and remove last empty item
42-
split("\u0000")[:-1]
43-
# remove leading "ci/lava/"
44-
| map(sub("^ci/lava/"; ""))
45-
# build include entries with target and pretty name
46-
| map({
47-
target: .,
48-
name: (
49-
.
50-
| sub("\\.yaml$"; "")
51-
| gsub("/"; " ")
52-
)
53-
})
54-
# output as matrix.include list
55-
| { include: . }
56-
')
57-
echo "jobmatrix=$J" >> $GITHUB_OUTPUT
58-
echo "Preparing testjob files"
5921

6022
submit-job:
61-
needs: prepare-job-list
6223
runs-on: ubuntu-latest
6324
name: Submit ${{ matrix.name }}
6425
strategy:
6526
fail-fast: false
66-
matrix: ${{ fromJson(needs.prepare-job-list.outputs.jobmatrix) }}
27+
matrix:
28+
include:
29+
- device_type: qcs6490-rb3gen2-vision-kit
30+
lava_template: ci/lava/qcs6490-rb3gen2-vision-kit/boot.yaml
31+
name: qcs6490-rb3gen2-vision-kit boot
32+
- device_type: qrb2210-rb1
33+
lava_template: ci/lava/qrb2210-rb1/boot.yaml
34+
name: qrb2210-rb1 boot
6735
steps:
36+
- name: Print trigger
37+
run: |
38+
echo "Triggered by ${{ github.event_name }}"
39+
echo "Build URL: $BUILD_URL"
40+
6841
- name: Clone repository
6942
uses: actions/checkout@v4
7043
with:
7144
fetch-depth: 0
7245

7346
- name: Update test definition ${{ matrix.target }}
7447
run: |
75-
# e.g. qrb2210-rb1/boot.yaml
76-
TARGET="${{ matrix.target }}"
77-
TEMPLATE="${LAVA_CI}${TARGET}"
78-
# left-side – e.g. qrb2210-rb1
79-
DEVICE_TYPE="${TARGET%/*}"
48+
TEMPLATE="${{ matrix.lava_template }}"
49+
DEVICE_TYPE="${{ matrix.device_type }}"
8050
BUILD_DOWNLOAD_URL="$BUILD_URL"
8151
BUILD_FILE_NAME="unused"
8252
sed \

0 commit comments

Comments
 (0)