Skip to content

Commit a5d75b8

Browse files
committed
plans(video): simplify V4L2 plan and use LAVA secrets run base+overlay
- Introduce a trimmed, fastrpc-style YAML for the Video V4L2 runner. - Consume Wi-Fi creds strictly via LAVA secrets env (LAVA_WIFI_SSID / LAVA_WIFI_PASSWORD). - Auto-args by platform: - kodiak: set --app and --downstream-fw (+ pass SSID/PASSWORD) - lemans/monaco: pass SSID/PASSWORD; no downstream-fw flag - Run two passes in one job: --stack base then --stack overlay. - Post results via send-to-lava.sh; keep optional result_parse.sh. - No repo-wide env changes; preserves run.sh interfaces. - Backward-compatible with existing device job templates. Signed-off-by: Srikanth Muppandam <[email protected]>
1 parent 3b11f1a commit a5d75b8

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

Runner/plans/video_pre-merge.yaml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
metadata:
22
format: Lava-Test Test Definition 1.0
3-
name: Video_V4L2_All
4-
description: "Single YAML: pass TARGET, STACK, iris path and downstream FW; run.sh handles the rest"
3+
name: Video_V4L2_With_Secrets
4+
description: "Run Video V4L2 runner; use LAVA secrets for Wi-Fi; auto-args for kodiak vs lemans/monaco; run base & overlay"
55
maintainer:
66
77
os:
88
- openembedded
99
scope:
1010
- functional
11-
11+
1212
run:
1313
steps:
1414
- cd Runner
1515
- export REPO_ROOT="$PWD"
16-
17-
# --- Job-level inputs (set per device/job) ---
18-
- export TARGET="${TARGET:-}" # e.g. Kodiak|LeMans|Monaco|Talos
19-
- export STACK="${STACK:-both}" # base|overlay|auto|both or synonyms: upstream|downstream
20-
- export IRIS_BIN="${IRIS_BIN:-}" # optional: /path/to/iris_v4l2_test
21-
- export DOWNSTREAM_FW="${DOWNSTREAM_FW:-}" # optional: firmware blob for overlay
22-
23-
# Normalize STACK -> MODE (one-liner synonyms)
24-
- export MODE_NORM="$(printf '%s' "$STACK" | tr '[:upper:]' '[:lower:]' | sed -e 's/^upstream$/base/' -e 's/^downstream$/overlay/')"
25-
- |
26-
case "$MODE_NORM" in base|overlay|auto|both) : ;; *) MODE_NORM="both" ;; esac
27-
echo "TARGET=$TARGET STACK=$STACK MODE_NORM=$MODE_NORM"
28-
29-
# Build args for run.sh (match your CLI exactly)
16+
- export TARGET="${TARGET:-}" # expected values: kodiak | lemans | monaco (case-insensitive)
17+
18+
# Read Wi-Fi credentials from LAVA-provided secrets (exported as env vars in the job)
19+
- export SSID="${LAVA_WIFI_SSID:-}"
20+
- export PASSWORD="${LAVA_WIFI_PASSWORD:-}"
21+
22+
# Build args for run.sh based on TARGET; always pass secrets; add downstream FW only for kodiak
3023
- |
24+
RPATH="$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/run.sh"
25+
RESFILE="$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/Video_V4L2_Runner.res"
3126
ARGS=""
32-
[ -n "$TARGET" ] && ARGS="$ARGS --target \"$TARGET\""
33-
34-
if [ -n "$IRIS_BIN" ]; then
35-
ARGS="$ARGS --iris-bin \"$IRIS_BIN\""
36-
else
37-
IB="$(command -v iris_v4l2_test 2>/dev/null || true)"
38-
[ -n "$IB" ] && ARGS="$ARGS --iris-bin \"$IB\""
39-
fi
40-
41-
[ -n "$DOWNSTREAM_FW" ] && ARGS="$ARGS --downstream-fw \"$DOWNSTREAM_FW\""
42-
43-
echo "ARGS=$ARGS"
44-
45-
# Single call: run.sh handles base/overlay/auto and 'both' via its reexec shim
46-
- |
47-
cd "$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner"
27+
TL="$(printf '%s' "${TARGET:-}" | tr '[:upper:]' '[:lower:]')"
28+
case "$TL" in
29+
kodiak)
30+
ARGS="$ARGS --platform kodiak --app /data/vendor/iris_test_app/iris_v4l2_test --ssid \"$SSID\" --password \"$PASSWORD\" --downstream-fw /data/vendor/iris_test_app/vpu20_p1_gen2.mbn"
31+
;;
32+
lemans)
33+
ARGS="$ARGS --platform lemans --ssid \"$SSID\" --password \"$PASSWORD\"" --app /data/vendor/iris_test_app/iris_v4l2_test
34+
;;
35+
monaco)
36+
ARGS="$ARGS --platform monaco --ssid \"$SSID\" --password \"$PASSWORD\"" --app /data/vendor/iris_test_app/iris_v4l2_test
37+
;;
38+
*)
39+
# Unknown or not provided: still pass secrets; platform autodetect in run.sh
40+
ARGS="$ARGS --ssid \"$SSID\" --password \"$PASSWORD\""
41+
;;
42+
esac
43+
echo "TARGET=${TARGET:-unset} ARGS=$ARGS"
44+
45+
# Run base (upstream) then overlay (downstream)
46+
# shellcheck disable=SC2086
47+
sh -lc "$RPATH --stack base $ARGS" || true
48+
"$REPO_ROOT/utils/send-to-lava.sh" "$RESFILE" || true
49+
4850
# shellcheck disable=SC2086
49-
sh -lc "./run.sh $ARGS --mode \"$MODE_NORM\"" || true
50-
51-
# Report result (AUSanity style)
52-
- "$REPO_ROOT/utils/send-to-lava.sh" "$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/Video_V4L2_Runner.res" || true
53-
54-
# Optional roll-up (ignored if absent)
55-
- "$REPO_ROOT/utils/result_parse.sh" || true
51+
sh -lc "$RPATH --stack overlay $ARGS" || true
52+
"$REPO_ROOT/utils/send-to-lava.sh" "$RESFILE" || true
53+
54+
# Optional roll-up (ignored if absent)
55+
"$REPO_ROOT/utils/result_parse.sh" || true

0 commit comments

Comments
 (0)