Skip to content

Commit 57e3cd2

Browse files
Helen Koikemripard
authored andcommitted
drm/ci: uprev IGT and make sure core_getversion is run
IGT has recently merged a patch that makes code_getversion test to fails if the driver isn't loaded or if it isn't the expected one defined in variable IGT_FORCE_DRIVER. Without this test, jobs were passing when the driver didn't load or probe for some reason, giving the illusion that everything was ok. Uprev IGT to include this modification and include core_getversion test in all the shards. Signed-off-by: Helen Koike <[email protected]> Reviewed-by: David Heidelberg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent d70896f commit 57e3cd2

File tree

3 files changed

+26
-9
lines changed

3 files changed

+26
-9
lines changed

drivers/gpu/drm/ci/gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variables:
55
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
66
TARGET_BRANCH: drm-next
77

8-
IGT_VERSION: 471bfababd070e1dac0ebb87470ac4f2ae85e663
8+
IGT_VERSION: d1db7333d9c5fbbb05e50b0804123950d9dc1c46
99

1010
DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git
1111
DEQP_RUNNER_GIT_TAG: v0.15.0

drivers/gpu/drm/ci/igt_runner.sh

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@ set +e
2020
cat /sys/kernel/debug/dri/*/state
2121
set -e
2222

23-
# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib
24-
if [ "$IGT_FORCE_DRIVER" = "amdgpu" ]; then
25-
mv /install/modules/lib/modules/* /lib/modules/.
26-
modprobe amdgpu
27-
fi
23+
case "$DRIVER_NAME" in
24+
rockchip|mediatek|meson)
25+
export IGT_FORCE_DRIVER="panfrost"
26+
;;
27+
amdgpu)
28+
# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib
29+
mv /install/modules/lib/modules/* /lib/modules/.
30+
modprobe amdgpu
31+
;;
32+
esac
2833

2934
if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then
3035
IGT_SKIPS="--skips /install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt"
@@ -48,6 +53,20 @@ fi
4853

4954
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s ${FDO_HTTP_CACHE_URI:-}$PIPELINE_ARTIFACTS_BASE/$ARCH/igt.tar.gz | tar --zstd -v -x -C /
5055

56+
57+
# If the job is parallel at the gitab job level, take the corresponding fraction
58+
# of the caselist.
59+
if [ -n "$CI_NODE_INDEX" ]; then
60+
sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /install/testlist.txt
61+
fi
62+
63+
# core_getversion checks if the driver is loaded and probed correctly
64+
# so run it in all shards
65+
if ! grep -q "core_getversion" /install/testlist.txt; then
66+
# Add the line to the file
67+
echo "core_getversion" >> /install/testlist.txt
68+
fi
69+
5170
set +e
5271
igt-runner \
5372
run \
@@ -57,8 +76,6 @@ igt-runner \
5776
$IGT_SKIPS \
5877
$IGT_FLAKES \
5978
$IGT_FAILS \
60-
--fraction-start $CI_NODE_INDEX \
61-
--fraction $CI_NODE_TOTAL \
6279
--jobs 1
6380
ret=$?
6481
set -e

drivers/gpu/drm/ci/image-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ variables:
44
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
55

66
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
7-
DEBIAN_BUILD_TAG: "2023-10-06-amd"
7+
DEBIAN_BUILD_TAG: "2023-10-08-igt"
88

99
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
1010

0 commit comments

Comments
 (0)