[tracker/wip/carlosg/ci-playground: 2/2] squash!

[Carlos Garnacho <carlosg src gnome org>]

commit 8173fef85a6644845a988a471ea639271f046b84
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun May 16 11:47:20 2021 +0200

    squash!

 .gitlab-ci.yml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b20d0d01b..d648a6d2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,37 +21,31 @@ stages:
 
 .tracker.fedora@common:
   variables:
-    BASE_TAG: '2021-05-15.3'
+    BASE_TAG: '2021-05-15.5'
     FDO_UPSTREAM_REPO: GNOME/tracker
+    FDO_DISTRIBUTION_PACKAGES: 'clang gcovr git libasan libubsan python3-gobject python3-pip umockdev-devel 
xmlto'
     FDO_DISTRIBUTION_EXEC: |
       dnf install -y 'dnf-command(builddep)' &&
       dnf builddep -y tracker tracker-miners --setopt=install_weak_deps=False &&
-      dnf install -y clang gcovr git libasan libubsan python3-gobject python3-pip umockdev-devel xmlto &&
       dnf clean all &&
       pip3 install beautifulsoup4 mkdocs mkdocs-cinder tap.py meson
 
 .tracker.ubuntu@common:
   variables:
-    BASE_TAG: '2021-05-15.2'
+    BASE_TAG: '2021-05-15.5'
     FDO_UPSTREAM_REPO: GNOME/tracker
+    FDO_DISTRIBUTION_PACKAGES: 'python3-tap umockdev libumockdev-dev upower asciidoc-base git'
     FDO_DISTRIBUTION_EXEC: |
       export DEBIAN_FRONTEND=noninteractive &&
       sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list &&
       apt-get -yq update && apt-get -yq upgrade &&
-      apt-get -yq build-dep tracker tracker-miners &&
-      apt-get -yq install python3-tap umockdev libumockdev-dev upower &&
-      apt-get -yq install --no-install-recommends asciidoc-base &&
-      apt-get -yq install git
+      apt-get -yq build-dep tracker tracker-miners
 
 .tracker.alpine@common:
   variables:
-    BASE_TAG: '2021-05-15.4'
+    BASE_TAG: '2021-05-15.5'
     FDO_UPSTREAM_REPO: GNOME/tracker
-    FDO_DISTRIBUTION_EXEC: |
-      echo 'https://alpine.global.ssl.fastly.net/alpine/edge/community/' >> /etc/apk/repositories &&
-      apk add -U alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev \
-               gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson \
-               py3-gobject3 py3-setuptools py3-tappy sqlite-dev vala
+    FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev 
gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 
py3-setuptools py3-tappy sqlite-dev vala'
 
 .tracker.fedora:34@x86_64:
   extends: .tracker.fedora@common