Skip to content

Commit 60f390b

Browse files
committed
lava: Video_V4L2_With_Secrets: switch to local media bundle; keep base free of ko args
- Stop relying on Wi-Fi/LAVA secrets for clip fetch; pass local bundle: CLIPS_TAR=/data/vendor/iris_test_app/video_clips_iris.tar.gz CLIPS_DEST=/data/vendor/iris_test_app/clips - Invoke run.sh twice: - BASE (upstream): add only --clips-* (no ko options) - OVERLAY (downstream): add --clips-* plus --ko-dir and --ko-prefer-custom - On Kodiak overlay, include --downstream-fw to satisfy FW requirement. - Keep platform flag conditional (kodiak|lemans|monaco) with autodetect fallback. - Preserve result shipping via send-to-lava.sh and optional roll-up. Signed-off-by: Srikanth Muppandam <[email protected]>
1 parent 17cb407 commit 60f390b

File tree

1 file changed

+36
-27
lines changed

1 file changed

+36
-27
lines changed

Runner/plans/video_pre-merge.yaml

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,63 @@
11
metadata:
22
format: Lava-Test Test Definition 1.0
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"
3+
name: Video_V4L2_LocalClips
4+
description: "Run Video V4L2 runner with local clips tar and custom .ko dir; auto-args for kodiak vs lemans/monaco; run base & overlay"
55
maintainer:
66
77
os:
88
- openembedded
99
scope:
1010
- functional
11-
1211
run:
1312
steps:
1413
- cd Runner
1514
- export REPO_ROOT="$PWD"
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:-}"
15+
- export TARGET="${TARGET:-}" # kodiak | lemans | monaco (case-insensitive)
2116

22-
# Build args for run.sh based on TARGET; always pass secrets; add downstream FW only for kodiak
2317
- |
2418
RPATH="$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/run.sh"
2519
RESFILE="$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/Video_V4L2_Runner.res"
26-
ARGS=""
20+
21+
# Custom media bundle (local) paths
22+
CLIPS_TAR="/data/vendor/iris_test_app/video_clips_iris.tar.gz"
23+
CLIPS_DEST="/data/vendor/iris_test_app/clips"
24+
25+
# Custom downstream module location (directory containing iris_vpu.ko)
26+
KO_DIR="/data/vendor/iris_test_app"
27+
28+
# Optional: downstream firmware needed on Kodiak overlay
29+
DS_FW="/data/vendor/iris_test_app/vpu20_p1_gen2.mbn"
30+
31+
# Normalize/derive platform flag
2732
TL="$(printf '%s' "${TARGET:-}" | tr '[:upper:]' '[:lower:]')"
2833
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-
;;
34+
kodiak|lemans|monaco) PLAT="--platform $TL" ;;
35+
*) PLAT="" ;; # autodetect
4236
esac
43-
echo "TARGET=${TARGET:-unset} ARGS=$ARGS"
4437
45-
# Run base (upstream) then overlay (downstream)
38+
# Common args (clips local, no Wi-Fi or TAR_URL needed)
39+
ARGS_COMMON="--clips-tar $CLIPS_TAR --clips-dest $CLIPS_DEST --app /data/vendor/iris_test_app/iris_v4l2_test $PLAT --retry-on-fail 2 --loglevel 15"
40+
41+
# --- BASE (upstream): NO ko args here ---
42+
ARGS_BASE="--stack base $ARGS_COMMON"
43+
44+
# --- OVERLAY (downstream): add ko args; on kodiak also add downstream FW ---
45+
ARGS_OVERLAY="--stack overlay $ARGS_COMMON --ko-dir $KO_DIR --ko-prefer-custom"
46+
if [ "$TL" = "kodiak" ]; then
47+
ARGS_OVERLAY="$ARGS_OVERLAY --downstream-fw $DS_FW"
48+
fi
49+
50+
echo "BASE ARGS: $ARGS_BASE"
51+
echo "OVERLAY ARGS: $ARGS_OVERLAY"
52+
53+
# Run BASE (upstream)
4654
# shellcheck disable=SC2086
47-
sh -lc "$RPATH --stack base $ARGS" || true
55+
sh -lc "$RPATH $ARGS_BASE" || true
4856
"$REPO_ROOT/utils/send-to-lava.sh" "$RESFILE" || true
4957
58+
# Run OVERLAY (downstream)
5059
# shellcheck disable=SC2086
51-
sh -lc "$RPATH --stack overlay $ARGS" || true
60+
sh -lc "$RPATH $ARGS_OVERLAY" || true
5261
"$REPO_ROOT/utils/send-to-lava.sh" "$RESFILE" || true
5362
5463
# Optional roll-up (ignored if absent)

0 commit comments

Comments
 (0)