ci: Update base image to use bullseye

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Rohan Garg <rohan.garg@collabora.com>
macos/master
Gert Wollny 4 years ago
parent 8aec28bd74
commit eadbeac92e
  1. 4
      ci/.gitlab-ci.yml
  2. 26
      ci/build-container.sh
  3. 2
      ci/run_ci_locally.sh
  4. 2
      ci/run_tests.sh

@ -1,6 +1,6 @@
variables: variables:
FDO_DISTRIBUTION_TAG: "2021-02-04" FDO_DISTRIBUTION_TAG: "2021-06-06"
FDO_DISTRIBUTION_VERSION: buster FDO_DISTRIBUTION_VERSION: bullseye
FDO_UPSTREAM_REPO: "virgl/virglrenderer" FDO_UPSTREAM_REPO: "virgl/virglrenderer"
TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"

@ -9,8 +9,8 @@ export PATH=$PATH:/usr/local/go/bin
export LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu export LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig
export LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib/ -L/usr/local/lib/x86_64-linux-gnu" export LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib/ -L/usr/local/lib/x86_64-linux-gnu"
export CC="gcc-8" export CC="gcc"
export CXX="g++-8" export CXX="g++"
export CFLAGS="-g3" export CFLAGS="-g3"
export CXXFLAGS="-g3" export CXXFLAGS="-g3"
export GIT_DATE="2020-02-02" export GIT_DATE="2020-02-02"
@ -22,8 +22,8 @@ echo '#!/bin/sh' > /usr/sbin/policy-rc.d
echo 'exit 101' >> /usr/sbin/policy-rc.d echo 'exit 101' >> /usr/sbin/policy-rc.d
chmod +x /usr/sbin/policy-rc.d chmod +x /usr/sbin/policy-rc.d
echo deb-src http://deb.debian.org/debian buster main >> /etc/apt/sources.list echo deb-src http://deb.debian.org/debian bullseye main >> /etc/apt/sources.list
echo deb http://deb.debian.org/debian buster-backports main >> /etc/apt/sources.list echo deb http://deb.debian.org/debian bullseye-backports main >> /etc/apt/sources.list
apt-get update apt-get update
apt-get -y install ca-certificates apt-get -y install ca-certificates
apt-get -y install --no-install-recommends \ apt-get -y install --no-install-recommends \
@ -31,13 +31,13 @@ apt-get -y install --no-install-recommends \
busybox \ busybox \
ccache \ ccache \
check \ check \
clang-8 \ clang \
cmake \ cmake \
dbus \ dbus \
g++-8 \ g++ \
gcc-8 \ gcc \
gdb \ gdb \
gdc-8 \ gdc \
git \ git \
golang-go \ golang-go \
kbd \ kbd \
@ -51,17 +51,17 @@ apt-get -y install --no-install-recommends \
libwayland-dev \ libwayland-dev \
libwayland-egl-backend-dev \ libwayland-egl-backend-dev \
linux-image-amd64 \ linux-image-amd64 \
lld-8 \ lld \
llvm-8-dev \ llvm-11-dev \
mesa-utils \ mesa-utils \
meson \ meson \
nasm \ nasm \
ninja-build \ ninja-build \
procps \ procps \
psmisc \ psmisc \
python-numpy \ python3-numpy \
python-six \ python3-six \
python-mako \ python3-mako \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-six \ python3-six \

@ -6,7 +6,7 @@
cd ${VIRGL_PATH} cd ${VIRGL_PATH}
DOCKER_DRIVER=overlay2 DOCKER_DRIVER=overlay2
DOCKER_IMAGE=${DOCKER_IMAGE:-registry.freedesktop.org/virgl/virglrenderer/debian/buster:latest} DOCKER_IMAGE=${DOCKER_IMAGE:-registry.freedesktop.org/virgl/virglrenderer/debian/bullseye:latest}
if [[ -z $NUM_THREADS ]] ; then if [[ -z $NUM_THREADS ]] ; then
# If not forced use slightly less than half of available threads # If not forced use slightly less than half of available threads

@ -57,7 +57,7 @@ run_setup()
mkdir build mkdir build
if [ "x$use_clang_fuzzer" = "x1" ]; then if [ "x$use_clang_fuzzer" = "x1" ]; then
export CC=clang-8 export CC=clang
export FUZZER=-Dfuzzer=true export FUZZER=-Dfuzzer=true
fi fi

Loading…
Cancel
Save