Module: Mesa Branch: master Commit: 05a3b49308606fbf8c30688ece3177ad6eb17515 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05a3b49308606fbf8c30688ece3177ad6eb17515
Author: Andres Gomez <[email protected]> Date: Thu Mar 26 23:00:15 2020 +0200 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 <[email protected]> Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> 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 \ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
