From 3a0cc0ee0d01e8ab5c833479baa12bd7074b0ec0 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Fri, 23 May 2025 09:12:55 +0200 Subject: [PATCH] ci: Use zstd compressed kernel modules Change how we package kernel modules: instead of storing them in .tar.zst archives with uncompressed .ko files inside, we now compress each .ko file individually with ZSTD and bundle them into a plain tar archive. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/image-tags.yml | 4 ++-- .gitlab-ci/lava/lava-submit.sh | 3 +-- src/amd/ci/gitlab-ci-inc.yml | 6 +++--- src/panfrost/ci/gitlab-ci-inc.yml | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 800cb34ad43..45b2a9facbb 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -30,11 +30,11 @@ variables: ALPINE_X86_64_BUILD_TAG: "20250423-rootfs" ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs" - ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250529-passfail" + ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250529-modules" FEDORA_X86_64_BUILD_TAG: "20250423-rootfs" - KERNEL_TAG: "v6.14-mesa-7c6b" + KERNEL_TAG: "v6.14-mesa-0e36" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "95bf62c" FIRMWARE_TAG: "36f9bbfa" diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index 6af4360365d..cd80c337c7e 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -112,8 +112,7 @@ PYTHONPATH=/ /lava/lava_job_submitter.py \ --format=tar \ - append-overlay \ --name=kernel-modules \ - --url="${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" \ - --compression=zstd \ + --url="${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar" \ --path="/" \ --format=tar \ "${LAVA_EXTRA_OVERLAYS[@]}" \ diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index 3b55bcce0dc..a06445eebeb 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -203,7 +203,7 @@ # Force fixed 6.6 kernel, amdgpu doesn't revcover from GPU resets on 6.13 # https://gitlab.freedesktop.org/drm/amd/-/issues/3861 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/12676 - KERNEL_TAG: "v6.6.21-mesa-83d9" + KERNEL_TAG: "v6.6.21-mesa-1978" # Status: https://lava.collabora.dev/scheduler/device_type/lenovo-TPad-C13-Yoga-zork .lava-lenovo-TPad-C13-Yoga-zork:x86_64: @@ -220,7 +220,7 @@ # Force fixed 6.6 kernel, amdgpu doesn't revcover from GPU resets on 6.13 # https://gitlab.freedesktop.org/drm/amd/-/issues/3861 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/12676 - KERNEL_TAG: "v6.6.21-mesa-83d9" + KERNEL_TAG: "v6.6.21-mesa-1978" # Status: https://lava.collabora.dev/scheduler/device_type/hp-x360-14a-cb0001xx-zork .lava-hp-x360-14a-cb0001xx-zork:x86_64: @@ -237,7 +237,7 @@ # Force fixed 6.6 kernel, amdgpu doesn't revcover from GPU resets on 6.13 # https://gitlab.freedesktop.org/drm/amd/-/issues/3861 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/12676 - KERNEL_TAG: "v6.6.21-mesa-83d9" + KERNEL_TAG: "v6.6.21-mesa-1978" ############### LAVA diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml index 20a0cf9344f..987337d8a92 100644 --- a/src/panfrost/ci/gitlab-ci-inc.yml +++ b/src/panfrost/ci/gitlab-ci-inc.yml @@ -203,7 +203,7 @@ KERNEL_IMAGE_TYPE: "" RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0 # Force fixed 6.6 kernel, we're not reliably getting a GPU on 6.13 - KERNEL_TAG: "v6.6.21-mesa-f8ea" + KERNEL_TAG: "v6.6.21-mesa-1978" # Status: https://lava.collabora.dev/scheduler/device_type/mt8195-cherry-tomato-r2 .lava-mt8195-cherry-tomato-r2:arm64: