igt_runner.sh looks up the skips, flakes and fails files using GPU_VERSION, which for sc7180 trogdor jobs is the board name.
The skips are the same for all sc7180 trogdor boards, but fails and flakes can differ. Add an optional SKIPS_FILE variable to override the skips file, so that it can be shared. Signed-off-by: Vignesh Raman <[email protected]> --- v1: - New patch in the series --- drivers/gpu/drm/ci/igt_runner.sh | 6 ++++-- drivers/gpu/drm/ci/test.yml | 1 + ...80-trogdor-kingoftown-skips.txt => msm-sc7180-skips.txt} | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename drivers/gpu/drm/ci/xfails/{msm-sc7180-trogdor-kingoftown-skips.txt => msm-sc7180-skips.txt} (100%) diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index 741d30655ab5..41c6f332a5e6 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -30,8 +30,10 @@ case "$DRIVER_NAME" in ;; esac -if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then - IGT_SKIPS="--skips /install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" +SKIPS_FILE=${SKIPS_FILE:-$DRIVER_NAME-$GPU_VERSION-skips.txt} + +if [ -e "/install/xfails/$SKIPS_FILE" ]; then + IGT_SKIPS="--skips /install/xfails/$SKIPS_FILE" fi if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-flakes.txt" ]; then diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 3777189e9737..248c6958cdbf 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -101,6 +101,7 @@ BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" LAVA_FIRMWARE: qcom-lava + SKIPS_FILE: msm-sc7180-skips.txt msm:sc7180-trogdor-kingoftown: extends: diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt similarity index 100% rename from drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt rename to drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt -- 2.47.3
