From 05a3b49308606fbf8c30688ece3177ad6eb17515 Mon Sep 17 00:00:00 2001
From: Andres Gomez <tanty@igalia.com>
Date: Thu, 26 Mar 2020 23:00:15 +0200
Subject: [PATCH] gitlab-ci: Don't use buster-backports packages by default for
 x86_test-vk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 .gitlab-ci.yml                      | 2 +-
 .gitlab-ci/container/x86_test-vk.sh | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75b2578b6c8..6a4cad8b40a 100644
--- 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 80652420b5f..250affa0044 100644
--- 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 \
-- 
2.30.2