Skip to content

Commit 5ceee25

Browse files
authored
Merge pull request #181 from lool/debian-specific-lava-descriptions
Improve LAVA job titles
2 parents 6b17443 + 18102c3 commit 5ceee25

File tree

5 files changed

+40
-22
lines changed

5 files changed

+40
-22
lines changed

.github/workflows/lava-schema-check.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ jobs:
2323
BUILD_DOWNLOAD_URL="https://example.com/downloads/1"
2424
GITHUB_SHA="7e6f96ccf3e911a8a1a18accdbb91991aa0db66e"
2525
26-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" '{}' \;
27-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" '{}' \;
28-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" '{}' \;
29-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" '{}' \;
30-
find ci/lava/ -name "*.yaml" -exec sed -i "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" '{}' \;
26+
find ci/lava/ -name "*.yaml" -exec sed \
27+
-e "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" \
28+
-e "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" \
29+
-e "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" \
30+
-e "s|{{GITHUB_REPOSITORY}}|${GITHUB_REPOSITORY}|g" \
31+
-e "s|{{GITHUB_RUN_ATTEMPT}}|${GITHUB_RUN_ATTEMPT}|g" \
32+
-e "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" \
33+
-e "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" \
34+
-i '{}' \;
3135
32-
python3 ci/schemacheck.py ./ci/lava/
36+
ci/schemacheck.py ci/lava/

.github/workflows/lava-test.yml

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ permissions:
1616

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

2021
jobs:
2122
prepare-job-list:
@@ -34,10 +35,15 @@ jobs:
3435
- name: "List jobs"
3536
id: listjobs
3637
run: |
37-
JOBFILES=$(find ci/lava/ -name *.yaml)
38-
JOBFILES=$(echo "$JOBFILES" | sed -e "s/^/\"/" | sed -e "s/$/\",/" | tr -d "\n" | sed -e "s/.$//")
39-
JOBFILES="[${JOBFILES}]"
40-
J=$(jq -cn --argjson jobfiles "$JOBFILES" '{target: $jobfiles}')
38+
# json with list of relative filenames to LAVA templates
39+
J=$(find "${LAVA_CI}" -name '*.yaml' -print0 |
40+
jq -Rs '
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+
| {target: .}
46+
')
4147
echo "jobmatrix=$J" >> $GITHUB_OUTPUT
4248
echo "Preparing testjob files"
4349
@@ -55,24 +61,31 @@ jobs:
5561

5662
- name: "Update test definition ${{ matrix.target }}"
5763
run: |
58-
TARGET=${{ matrix.target }}
59-
FIND_PATH="${TARGET#*/}"
60-
DEVICE_TYPE_PATH="${FIND_PATH%/*}"
61-
DEVICE_TYPE="${DEVICE_TYPE_PATH#*/}"
64+
# e.g. qrb2210-rb1/boot.yaml
65+
TARGET="${{ matrix.target }}"
66+
TEMPLATE="${LAVA_CI}${TARGET}"
67+
# left-side – e.g. qrb2210-rb1
68+
DEVICE_TYPE="${TARGET%/*}"
6269
BUILD_DOWNLOAD_URL="$BUILD_URL"
63-
sed -i "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" "${{ matrix.target }}"
64-
sed -i "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" "${{ matrix.target }}"
65-
sed -i "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" "${{ matrix.target }}"
66-
sed -i "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" "${{ matrix.target }}"
67-
cat "${{ matrix.target }}"
70+
BUILD_FILE_NAME="unused"
71+
sed \
72+
-e "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" \
73+
-e "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" \
74+
-e "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" \
75+
-e "s|{{GITHUB_REPOSITORY}}|${GITHUB_REPOSITORY}|g" \
76+
-e "s|{{GITHUB_RUN_ATTEMPT}}|${GITHUB_RUN_ATTEMPT}|g" \
77+
-e "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" \
78+
-e "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" \
79+
-i "$TEMPLATE"
80+
cat "$TEMPLATE"
6881
6982
- name: Submit ${{ matrix.target }}
7083
timeout-minutes: 240
7184
uses: foundriesio/lava-action@v6
7285
with:
7386
lava_token: ${{ secrets.LAVATOKEN }}
7487
lava_url: 'lava.infra.foundries.io'
75-
job_definition: ${{ matrix.target }}
88+
job_definition: ${{ env.LAVA_CI }}${{ matrix.target }}
7689
wait_for_job: true
7790
fail_action_on_failure: false
7891
save_result_as_artifact: true

ci/lava/qcs6490-rb3gen2-core-kit/boot.yaml renamed to ci/lava/qcs6490-rb3gen2-vision-kit/boot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ context:
7171
lava_test_results_dir: /home/lava-%s
7272
test_character_delay: 10
7373
device_type: qcs6490
74-
job_name: boot test (rb3gen2) {{GITHUB_RUN_ID}}
74+
job_name: smoke tests {{GITHUB_REPOSITORY}} {{GITHUB_RUN_ID}}-{{GITHUB_RUN_ATTEMPT}}
7575
metadata:
7676
build-commit: '{{GITHUB_SHA}}'
7777
priority: 50

ci/lava/qrb2210-rb1/boot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ context:
7272
lava_test_results_dir: /home/lava-%s
7373
test_character_delay: 10
7474
device_type: qrb2210-rb1
75-
job_name: boot test (rb1) {{GITHUB_RUN_ID}}
75+
job_name: smoke tests {{GITHUB_REPOSITORY}} {{GITHUB_RUN_ID}}-{{GITHUB_RUN_ATTEMPT}}
7676
metadata:
7777
build-commit: '{{GITHUB_SHA}}'
7878
priority: 50

ci/schemacheck.py

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env python3
12
# Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
23
# SPDX-License-Identifier: MIT
34

0 commit comments

Comments
 (0)