Skip to content

Commit 83fbf03

Browse files
committed
LAVA: Video_V4L2_LocalClips: use local clips tar; simplify runner args
Switch test to provide a local media bundle via --clips-tar and rely on run.sh’s default extraction path (no --clips-dest needed). Keep the upstream (base) run free of custom ko args; add --ko-dir/--ko-prefer-custom for the overlay (downstream) run and always pass --downstream-fw (harmless on non-Kodiak). - Remove explicit --clips-dest (runner now defaults near cfg/testcase dir) - Pass --clips-tar and --app only; no Wi-Fi/TAR_URL required - Derive --platform from TARGET if set; otherwise let runner autodetect - Echo constructed args for CI debugging; preserve step order and result upload Signed-off-by: Srikanth Muppandam <[email protected]>
1 parent 816d57b commit 83fbf03

File tree

1 file changed

+26
-9
lines changed

1 file changed

+26
-9
lines changed

Runner/plans/video_pre-merge.yaml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,48 @@ run:
1818
RPATH="$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/run.sh"
1919
RESFILE="$REPO_ROOT/suites/Multimedia/Video/Video_V4L2_Runner/Video_V4L2_Runner.res"
2020
21-
# Custom media bundle (local) paths
21+
# Custom media bundle (local) path
2222
CLIPS_TAR="/data/vendor/iris_test_app/video_clips_iris.tar.gz"
23-
CLIPS_DEST="/data/vendor/iris_test_app/clips"
2423
2524
# Custom downstream module location (directory containing iris_vpu.ko)
2625
KO_DIR="/data/vendor/iris_test_app"
2726
2827
# Optional: downstream firmware needed on Kodiak overlay
29-
DS_FW="/data/vendor/iris_test_app/vpu20_p1_gen2.mbn"
28+
DS_FW="/data/vendor/iris_test_app/vpu20_1v.mbn"
29+
30+
# Prefer explicit TARGET; otherwise derive from LAVA device-type
31+
if [ -n "${TARGET:-}" ]; then
32+
TL="$(printf '%s' "$TARGET" | tr '[:upper:]' '[:lower:]')"
33+
else
34+
DEVTYPE_RAW="${DEVICE_TYPE:-${LAVA_DEVICE_TYPE:-${LAVA_DEVICE_TYPE_NAME:-${DEVICE_TYPE_NAME:-}}}}"
35+
DEVTYPE="$(printf '%s' "$DEVTYPE_RAW" | tr '[:upper:]' '[:lower:]')"
36+
case "$DEVTYPE" in
37+
# monaco
38+
qcs8300-ride|qcs8300-ride-sx|iq-8275-evk) TL="monaco" ;;
39+
# lemans
40+
qcs9100-ride-r3|sa8775p-ride|iq-9075-evk|qcs9075-rb8|qcs9100-ride-sx) TL="lemans" ;;
41+
# kodiak
42+
qcs6490-rb3gen2|rb3gen2|qcs6490-rb3gen2-core-kit) TL="kodiak" ;;
43+
# fallback to autodetect in run.sh
44+
*) TL="" ;;
45+
esac
46+
fi
3047
31-
# Normalize/derive platform flag
32-
TL="$(printf '%s' "${TARGET:-}" | tr '[:upper:]' '[:lower:]')"
3348
case "$TL" in
3449
kodiak|lemans|monaco) PLAT="--platform $TL" ;;
3550
*) PLAT="" ;; # autodetect
3651
esac
3752
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"
53+
echo "DEBUG: TARGET='${TARGET:-}' DEVTYPE='${DEVTYPE:-}' -> TL='$TL' PLAT='$PLAT'"
54+
55+
# Common args (local clips; no Wi-Fi/TAR_URL needed)
56+
ARGS_COMMON="--clips-tar $CLIPS_TAR --app /data/vendor/iris_test_app/iris_v4l2_test $PLAT --retry-on-fail 2 --loglevel 15"
4057
4158
# --- BASE (upstream): NO ko args here ---
4259
ARGS_BASE="--stack base $ARGS_COMMON"
4360
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"
61+
# --- OVERLAY (downstream): add ko args; only add FW on kodiak ---
62+
ARGS_OVERLAY="--stack overlay $ARGS_COMMON"
4663
if [ "$TL" = "kodiak" ]; then
4764
ARGS_OVERLAY="$ARGS_OVERLAY --downstream-fw $DS_FW"
4865
fi

0 commit comments

Comments
 (0)