From 61a77c9ce2a10d0463ce700a156c2648db4e5ea5 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Mon, 22 Aug 2022 15:05:22 +0200
Subject: [PATCH] ci: update CI to reflect clovers LLVM version bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16047>
---
 .gitlab-ci/build/gitlab-ci.yml                | 5 +----
 .gitlab-ci/container/debian/x86_build-base.sh | 2 --
 .gitlab-ci/container/debian/x86_build.sh      | 1 -
 .gitlab-ci/container/debian/x86_test-base.sh  | 1 -
 .gitlab-ci/image-tags.yml                     | 4 ++--
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index ae5f5290780..084672d53b7 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -438,7 +438,7 @@ debian-clover:
       -D glx=disabled
       -D egl=disabled
       -D gbm=disabled
-    GALLIUM_DRIVERS: "r600,radeonsi"
+    GALLIUM_DRIVERS: "r600,radeonsi,swrast"
     GALLIUM_ST: >
       -D dri3=disabled
       -D gallium-vdpau=disabled
@@ -450,9 +450,6 @@ debian-clover:
       -D gallium-opencl=icd
     EXTRA_OPTION: >
       -D valgrind=false
-  script:
-    - LLVM_VERSION=9 GALLIUM_DRIVERS=r600,swrast .gitlab-ci/meson/build.sh
-    - .gitlab-ci/meson/build.sh
 
 debian-vulkan:
   extends: .meson-build
diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
index 92c4ad60227..dff57fa0867 100644
--- a/.gitlab-ci/container/debian/x86_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_build-base.sh
@@ -36,7 +36,6 @@ apt-get install -y --no-remove \
         kmod \
         libclang-13-dev \
         libclang-11-dev \
-        libclang-9-dev \
         libclc-dev \
         libelf-dev \
         libepoxy-dev \
@@ -44,7 +43,6 @@ apt-get install -y --no-remove \
         libgtk-3-dev \
         libllvm13 \
         libllvm11 \
-        libllvm9 \
         libomxil-bellagio-dev \
         libpciaccess-dev \
         libunwind-dev \
diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index 67b939e7872..d9dcb760b78 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -41,7 +41,6 @@ apt-get install -y --no-remove \
       libxml2-dev \
       llvm-13-dev \
       llvm-11-dev \
-      llvm-9-dev \
       ocl-icd-opencl-dev \
       python3-freezegun \
       python3-pytest \
diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index 5078ffca695..eb4d7876f0c 100644
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -62,7 +62,6 @@ apt-get install -y --no-remove \
       libexpat1 \
       libllvm13 \
       libllvm11 \
-      libllvm9 \
       liblz4-1 \
       libpng16-16 \
       libpython3.9 \
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 025fef9d2fe..458e8e7be82 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,9 +1,9 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-08-17-bump"
+   DEBIAN_BASE_TAG: "2022-08-22-drop-llvm9"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-08-17-bump"
+   DEBIAN_BUILD_TAG: "2022-08-22-drop-llvm9"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-08-17-bump"