From 3120fec0c0b53d4825014fd4a48d80d7067b5249 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Tue, 15 Oct 2024 09:47:21 +0200 Subject: [PATCH] ci: remove selinux from containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Michel Dänzer Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/container/alpine/x86_64_build.sh | 1 - .gitlab-ci/container/fedora/x86_64_build.sh | 1 - .gitlab-ci/image-tags.yml | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh index 73a6f2d3e96..6e25c1ab936 100644 --- a/.gitlab-ci/container/alpine/x86_64_build.sh +++ b/.gitlab-ci/container/alpine/x86_64_build.sh @@ -38,7 +38,6 @@ DEPS=( elfutils-dev libclc-dev libdrm-dev - libselinux-dev libva-dev libpciaccess-dev zlib-dev diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh index 6615ed170cd..65a64e32d6d 100644 --- a/.gitlab-ci/container/fedora/x86_64_build.sh +++ b/.gitlab-ci/container/fedora/x86_64_build.sh @@ -48,7 +48,6 @@ DEPS=( "pkgconfig(libclc)" "pkgconfig(libelf)" "pkgconfig(libglvnd)" - "pkgconfig(libselinux)" "pkgconfig(libva)" "pkgconfig(pciaccess)" "pkgconfig(vdpau)" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 8bad6400813..67f01ceafc6 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -35,9 +35,9 @@ variables: DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20241002-pyutils" - ALPINE_X86_64_BUILD_TAG: "20240814-var" + ALPINE_X86_64_BUILD_TAG: "20241018-no-selinux" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" - FEDORA_X86_64_BUILD_TAG: "20240717-pyyaml" + FEDORA_X86_64_BUILD_TAG: "20241018-no-selinux" KERNEL_TAG: "v6.6.21-mesa-f8ea" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "bca9635d"