[at-spi2-core: 3/7] Install clang/libasan6/lcov in the CI image

[Federico Mena Quintero <federico src gnome org>]

commit 52733c88ae3144da78481a2ac9f51c2056080c0b
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Dec 16 14:03:25 2021 -0600

    Install clang/libasan6/lcov in the CI image

 .gitlab-ci.yml                 | 24 +++---------------------
 .gitlab-ci/opensuse.Dockerfile |  4 ++++
 2 files changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 323837c2..714dc989 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,16 +40,6 @@ stages:
 #     - dnf install -y clang-tools-extra curl diffutils git
 #     - sh -x ./.gitlab-ci/run-style-check.sh
 
-# Template for setting up build jobs.
-#
-# Depends on these variables:
-# @EXTRA_DEPS: Extra dependencies specific to each job (e.g. lcov for the coverage job).
-.build-setup:
-  image: $OPENSUSE_TUMBLEWEED_IMAGE
-  extends: .only-default
-  before_script:
-    - zypper refresh
-    - zypper install -y ${EXTRA_DEPS}
 
 # Template for the default build recipe.
 #
@@ -113,13 +103,10 @@ opensuse-x86_64:
 #
 # The logs are part of the compilation stderr.
 static-scan:
-  extends: .build-setup
+  image: $OPENSUSE_TUMBLEWEED_IMAGE
   stage: analysis
   needs: []
   variables:
-    EXTRA_DEPS:
-      clang
-      clang-tools
     MESON_EXTRA_FLAGS: "--buildtype=debug -Dintrospection=no -Ddocs=false"
   script:
     - meson setup ${MESON_EXTRA_FLAGS} --prefix /usr _scan_build .
@@ -132,13 +119,10 @@ static-scan:
 
 # Build and run with address sanitizer (asan).
 asan-build:
-  extends: .build-setup
+  image: $OPENSUSE_TUMBLEWEED_IMAGE
   stage: analysis
   needs: []
   variables:
-    EXTRA_DEPS:
-      clang-tools
-      libasan6
     MESON_EXTRA_FLAGS: "--buildtype=debug -Db_sanitize=address -Db_lundef=false -Dintrospection=no 
-Ddocs=false"
   script:
     - CC=clang meson setup ${MESON_EXTRA_FLAGS} --prefix /usr _build .
@@ -155,12 +139,10 @@ asan-build:
 #
 # See the _coverage/ artifact for the HTML report.
 coverage:
-  extends: .build-setup
+  image: $OPENSUSE_TUMBLEWEED_IMAGE
   stage: analysis
   needs: []
   variables:
-    EXTRA_DEPS:
-      lcov
     MESON_EXTRA_FLAGS: "--buildtype=debug -Ddocs=false -Dintrospection=no"
     CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
   script:
diff --git a/.gitlab-ci/opensuse.Dockerfile b/.gitlab-ci/opensuse.Dockerfile
index 6ca3c5bf..6bf3ef20 100644
--- a/.gitlab-ci/opensuse.Dockerfile
+++ b/.gitlab-ci/opensuse.Dockerfile
@@ -7,6 +7,8 @@ FROM opensuse/tumbleweed:latest
 
 RUN zypper refresh                              \
  && zypper install -y                           \
+           clang                                \
+           clang-tools                          \
            gcc                                  \
            dbus-1                               \
            dbus-1-devel                         \
@@ -16,10 +18,12 @@ RUN zypper refresh                              \
            gobject-introspection-devel          \
            gsettings-desktop-schemas            \
            itstool                              \
+           libasan6                             \
            libxml2-devel                        \
            libxkbcommon-devel                   \
            libXi-devel                          \
            libXtst-devel                        \
+           lcov                                 \
            meson                                \
            ninja                                \
            python38                             \