KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab-ci: Stop using packages from Debian testing 

Not needed anymore (for now?).

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>
This commit is contained in:
Michel Dänzer 2020-05-31 00:09:18 +02:00 committed by Eric Anholt
parent c964be0cd7
commit b19c094dba
6 changed files with 17 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -150,7 +150,7 @@ x86_build:
x86_test-base:
extends: x86_build
variables:
FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-01"
FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-02"
.use-x86_test-base:
extends:
@ -167,13 +167,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-01"
FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-02"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-01"
FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:

25
.gitlab-ci/container/x86_build.sh
View File

@ -22,19 +22,9 @@ echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/s
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
echo 'deb https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/testing.list
apt-get update
# Don't use newer packages from testing by default
cat >/etc/apt/preferences <<EOF
Package: *
Pin: release a=testing
Pin-Priority: 100
EOF
apt-get dist-upgrade -y
apt-get install -y --no-remove \
autoconf \
automake \
@ -45,6 +35,7 @@ apt-get install -y --no-remove \
cmake \
flex \
g++ \
g++-mingw-w64-x86-64 \
gcc \
gettext \
git \
@ -75,6 +66,7 @@ apt-get install -y --no-remove \
libxshmfence-dev \
libxvmc-dev \
libxxf86vm-dev \
libz-mingw-w64-dev \
llvm-9-dev \
pkg-config \
python-mako \
@ -121,19 +113,6 @@ apt-get install -y --no-remove -t buster-backports \
llvm-8-dev \
# Install packages we need from Debian testing last, to avoid pulling in more
# Need to allow removing libgcc1 for these
apt-get install -y -t testing \
libstdc++6:i386 \
libstdc++6:ppc64el \
libstdc++6:s390x
apt-get install -y --no-remove -t testing \
g++-mingw-w64-x86-64-win32 \
libz-mingw-w64-dev
. .gitlab-ci/container/container_pre_build.sh

9
.gitlab-ci/container/x86_test-base.sh
View File

@ -15,17 +15,8 @@ echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/s
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
echo 'deb https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/testing.list
apt-get update
# Don't use newer packages from testing by default
cat >/etc/apt/preferences <<EOF
Package: *
Pin: release a=testing
Pin-Priority: 100
EOF
apt-get dist-upgrade -y
apt-get install -y --no-remove \

14
.gitlab-ci/container/x86_test-gl.sh
View File

@ -11,6 +11,7 @@ STABLE_EPHEMERAL=" \
automake \
ccache \
cmake \
g++ \
libgbm-dev \
libgles2-mesa-dev \
libpcre3-dev \
@ -28,19 +29,9 @@ STABLE_EPHEMERAL=" \
xz-utils \
"
TESTING_EPHEMERAL=" \
g++ \
libc6-dev \
"
apt-get update
apt-get install -y --no-remove \
$STABLE_EPHEMERAL
# Install packages we need from Debian testing last, to avoid pulling in more
apt-get install -y -t testing \
$TESTING_EPHEMERAL
. .gitlab-ci/container/container_pre_build.sh
@ -73,7 +64,6 @@ apt-get install -y -t testing \
ccache --show-stats
apt-get purge -y \
$STABLE_EPHEMERAL \
$TESTING_EPHEMERAL
$STABLE_EPHEMERAL
apt-get autoremove -y --purge

17
.gitlab-ci/container/x86_test-vk.sh
View File

@ -9,6 +9,7 @@ export DEBIAN_FRONTEND=noninteractive
STABLE_EPHEMERAL=" \
ccache \
cmake \
g++ \
libgbm-dev \
libgles2-mesa-dev \
liblz4-dev \
@ -25,17 +26,10 @@ STABLE_EPHEMERAL=" \
wget \
"
TESTING_EPHEMERAL=" \
g++ \
libc6-dev \
"
apt-get update
apt-get install -y --no-remove \
$STABLE_EPHEMERAL
# We need multiarch for Wine
# We need multiarch for Wine
dpkg --add-architecture i386
apt-get update
@ -45,10 +39,6 @@ apt-get install -y --no-remove \
wine32 \
wine64
# Install packages we need from Debian testing last, to avoid pulling in more
apt-get install -y -t testing \
$TESTING_EPHEMERAL
############### Set up Wine env variables
@ -135,7 +125,6 @@ wine \
ccache --show-stats
apt-get purge -y \
$STABLE_EPHEMERAL \
$TESTING_EPHEMERAL
$STABLE_EPHEMERAL
apt-get autoremove -y --purge

12
.gitlab-ci/piglit/quick_gl.txt
View File

@ -1573,8 +1573,10 @@ spec/intel_conservative_rasterization/intel_conservative_rasterization-invalid:
spec/intel_conservative_rasterization/intel_conservative_rasterization-invalid_gles3: skip
spec/intel_conservative_rasterization/intel_conservative_rasterization-tri: skip
spec/intel_conservative_rasterization/intel_conservative_rasterization-tri_gles3: skip
spec/khr_texture_compression_astc/array-gl: skip
spec/khr_texture_compression_astc/array-gles: skip
spec/khr_texture_compression_astc/array-gl/12x12 block dim: fail
spec/khr_texture_compression_astc/array-gl/5x5 block dim: fail
spec/khr_texture_compression_astc/array-gles/12x12 block dim: fail
spec/khr_texture_compression_astc/array-gles/5x5 block dim: fail
spec/khr_texture_compression_astc/miptree-gl hdr/hdr: notrun
spec/khr_texture_compression_astc/miptree-gl ldr/ldr: notrun
spec/khr_texture_compression_astc/miptree-gl ldr/ldr profile: fail
@ -1711,9 +1713,9 @@ summary:
name: results
---- --------
pass: 20703
fail: 218
fail: 222
crash: 0
skip: 1467
skip: 1465
timeout: 0
warn: 6
incomplete: 0
@ -1722,4 +1724,4 @@ summary:
changes: 0
fixes: 0
regressions: 0
total: 22412
total: 22414