gitlab-ci: Create separate docker images for Debian stretch & buster

Pros:
* Less fragile due to not mixing packages from stretch and buster
* No longer need to use third-party LLVM packages
* The buster image now uses GCC 8 for C++ as well (previously 6 for C++,
  8 for C), allowing to drop some hacks

Con:
* The stretch image now only uses GCC 6 for C as well as C++
* Need separate jobs for testing old LLVM versions

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

2 files changed, 56 insertions, 26 deletions

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 8e7f3e830b9..e77ae132772 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -11,28 +11,16 @@ for arch in $CROSS_ARCHITECTURES; do
 done
 
 apt-get install -y \
-      apt-transport-https \
       ca-certificates \
-      curl \
       wget \
-      unzip \
-      gnupg
-
-curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" >/etc/apt/sources.list.d/llvm7.list
-echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" >/etc/apt/sources.list.d/llvm8.list
+      unzip
 
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
+echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 
 apt-get update
-apt-get install -y --no-remove -t stretch-backports \
-      llvm-3.9-dev \
-      libclang-3.9-dev \
-      llvm-4.0-dev \
-      libclang-4.0-dev \
-      llvm-5.0-dev \
-      libclang-5.0-dev \
+
+apt-get install -y --no-remove \
       llvm-6.0-dev \
       libclang-6.0-dev \
       llvm-7-dev \
@@ -40,13 +28,7 @@ apt-get install -y --no-remove -t stretch-backports \
       llvm-8-dev \
       libclang-8-dev \
       g++ \
-      clang-8
-
-# Install remaining packages from Debian buster to get newer versions
-echo "deb https://deb.debian.org/debian/ buster main" >/etc/apt/sources.list.d/buster.list
-echo "deb https://deb.debian.org/debian/ buster-updates main" >/etc/apt/sources.list.d/buster-updates.list
-apt-get update
-apt-get install -y --no-remove \
+      clang-8 \
       git \
       bzip2 \
       zlib1g-dev \
@@ -273,10 +255,8 @@ rm -rf /VK-GL-CTS
 ############### Uninstall the build software
 
 apt-get purge -y \
-      git \
-      curl \
+      wget \
       unzip \
-      gnupg \
       cmake \
       git \
       libgles2-mesa-dev \
diff --git a/.gitlab-ci/debian-stretch-install.sh b/.gitlab-ci/debian-stretch-install.sh
new file mode 100644
index 00000000000..b9cfa4000b6
--- /dev/null
+++ b/.gitlab-ci/debian-stretch-install.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get install -y \
+      apt-transport-https \
+      ca-certificates
+
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
+
+apt-get update
+
+apt-get install -y --no-remove \
+      llvm-3.9-dev \
+      libclang-3.9-dev \
+      llvm-4.0-dev \
+      libclang-4.0-dev \
+      llvm-5.0-dev \
+      libclang-5.0-dev \
+      g++ \
+      bzip2 \
+      ccache \
+      zlib1g-dev \
+      pkg-config \
+      gcc \
+      git \
+      libepoxy-dev \
+      libclc-dev \
+      xz-utils \
+      libdrm-dev \
+      libexpat1-dev \
+      libelf-dev \
+      libunwind-dev \
+      libpng-dev \
+      python-mako \
+      python3-mako \
+      bison \
+      flex \
+      gettext \
+      scons \
+      meson
+
+
+############### Uninstall unused packages
+
+apt-get autoremove -y --purge