gitlab-ci: Don't use buster-backports packages by default for x86_test-vk

The backports repository can be temporarily inconsistent between
architectures, which can break the docker image build.

Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4238>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75b2578b6c83ccb4f5db7a02667743e8fb93ee3d..6a4cad8b40ab687f3b1a0da03621f56e2a6788d7 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-23"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-25"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:

diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 80652420b5fa276ec749205c06f3cc5e6d325841..250affa004466085196a807113f0ceed766ee4b7 100644 (file)
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -18,13 +18,6 @@ echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources
 
 apt-get update
 
-# Use newer packages from backports by default
-cat >/etc/apt/preferences <<EOF
-Package: *
-Pin: release a=buster-backports
-Pin-Priority: 500
-EOF
-
 apt-get dist-upgrade -y
 
 apt-get install -y --no-remove \