From af8ab2bb3ea998325482b24e9c11fd5960d879e7 Mon Sep 17 00:00:00 2001
From: Vignesh Raman <vignesh.raman@collabora.com>
Date: Thu, 16 Jan 2025 09:40:40 +0530
Subject: [PATCH] ci: Uprev kernel to 6.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move to 6.13-rc4 for all mesa-ci jobs except anv-jsl.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Reviewed-by: David Heidelberg <None>
Reviewed-by: Sergi Blanch Torné <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32788>
---
 .gitlab-ci/image-tags.yml          | 4 ++--
 src/freedreno/ci/gitlab-ci-inc.yml | 8 --------
 src/intel/ci/gitlab-ci.yml         | 2 ++
 src/panfrost/ci/gitlab-ci.yml      | 5 -----
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 3241ef244ad..46a88daed89 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -30,7 +30,7 @@ variables:
    DEBIAN_TEST_ANDROID_TAG: "20241220-venus"
    DEBIAN_TEST_GL_TAG: "20250114-piglit-63"
    DEBIAN_TEST_VK_TAG: "20250114-piglit-63"
-   KERNEL_ROOTFS_TAG: "20250114-piglit-63"
+   KERNEL_ROOTFS_TAG: "20250116-kernel"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241223-pyutils"
@@ -39,7 +39,7 @@ variables:
    ALPINE_X86_64_LAVA_SSH_TAG: "20241122-sections"
    FEDORA_X86_64_BUILD_TAG: "20241122-sections"
 
-   KERNEL_TAG: "v6.6.21-mesa-f8ea"
+   KERNEL_TAG: "v6.13-rc4-mesa-5e77"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "bca9635d"
 
diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index 31cbd71706f..f9c10c50bdf 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -235,8 +235,6 @@
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown
     VK_DRIVER: freedreno
-    # force fixed kernel until 6.11 is switched officially
-    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/sc7180-trogdor-lazor-limozeen
 .lava-sc7180-trogdor-lazor-limozeen:arm64:
@@ -253,8 +251,6 @@
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
     VK_DRIVER: freedreno
-    # force fixed kernel until 6.11 is switched officially
-    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"
 
 # Status: https://lava.collabora.dev/scheduler/device_type/sm8350-hdk
 .lava-sm8350-hdk:arm64:
@@ -272,8 +268,6 @@
     KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-sm8350-hdk
     VK_DRIVER: freedreno
-    # force fixed kernel until 6.11 is switched officially
-    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"
 
 
 .google-freedreno-test:
@@ -286,8 +280,6 @@
     PIGLIT_PLATFORM: mixed_glx_egl
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
     FARM: google
-    # force fixed kernel until 6.11 is switched officially
-    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"
   script:
     - ./install/bare-metal/fastboot.sh
 
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index d4fdabd4605..2618e638d67 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -8,6 +8,8 @@ anv-jsl:
   variables:
     DEQP_SUITE: anv-jsl
     VK_DRIVER: intel
+    # force fixed kernel, since too many flakes and unexpected results seen with 6.13-rc4
+    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-c984"
   parallel: 5
 
 anv-jsl-full:
diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml
index 26f241c2394..16769855799 100644
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -229,7 +229,6 @@
     BOOT_METHOD: u-boot
     KERNEL_IMAGE_NAME: Image
     KERNEL_IMAGE_TYPE: "image"
-    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-f9e9"
     RUNNER_TAG: mesa-ci-x86-64-lava-rk3588-rock-5b
     VK_DRIVER: panfrost
 
@@ -312,10 +311,6 @@ panfrost-t860-traces:arm64:
     - .panfrost-test
     - .lava-rk3399-gru-kevin:arm64
     - .panfrost-traces
-  variables:
-    # force fixed kernel until 6.11 is switched officially
-    EXTERNAL_KERNEL_TAG: "v6.11-rc7-mesa-3fb8"
-
 
 panfrost-g52-gl:arm64:
   parallel: 4