From bedb9b73db9b7eef1f457fc4c20f0d72ead7f43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Thu, 2 Jun 2022 14:13:14 +0300 Subject: [PATCH] radv/ci: bump most jobs to the kernel to 6.1 + latest firmwares MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately, not all jobs can be using Linux 6.1 right now, as NAVI10 hits __vm_enough_memory errors then hangs in VKCTS. So for this job, we will keep Linux 5.17 until this gets fixed. Reference: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7888 Reviewed-by: Timur Kristóf Reviewed-by: Samuel Pitoiset Signed-off-by: Martin Roukala (né Peres) Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 2 +- src/amd/ci/gitlab-ci.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 609ad420e95..b06277c63ed 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -210,7 +210,7 @@ rustfmt: # No need by default to pull the whole repo GIT_STRATEGY: none # boot2container initrd configuration parameters. - B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/144/download' # 5.17.1 + B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/519/download' # Linux 6.1 B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.8/downloads/initramfs.linux_amd64.cpio.xz' B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$' B2C_JOB_WARN_REGEX: '\*ERROR\* ring .* timeout, but soft recovered' diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 96f48e91448..ecbdf40697a 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -333,6 +333,9 @@ vkcts-navi10-valve: - .test-manual-mr variables: GPU_VERSION: radv-navi10-aco + # Use Linux 5.17 to work around hitting __vm_enough_memory then hanging on Linux 6.1 + # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/7888 for details + B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/144/download' # 5.17.1 vkcts-navi21-valve: parallel: 2