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

[Carlos Garnacho <carlosg src gnome org>]

commit ed29c3728705ffe9d11ce6739558e8ecfd2a4f3b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun May 16 11:18:32 2021 +0200

    squash!

 .gitlab-ci.yml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10e07ef56..592cb4d87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,10 @@
 include:
-  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/master/templates/ci-fairy.yml";
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/master/templates/alpine.yml'
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/master/templates/fedora.yml'
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/master/templates/ubuntu.yml'
+  - project: 'https://gitlab.freedesktop.org/freedesktop/ci-templates'
+    file:
+      - 'templates/ci-fairy.yml'
+      - 'templates/alpine.yml'
+      - 'templates/fedora.yml'
+      - 'templates/ubuntu.yml'
 
 variables:
   # These can be used to see verbose log output from the functional-tests.
@@ -109,7 +111,7 @@ build-alpine-container@x86_64:
   variables:
     GIT_STRATEGY: none
 
-.build-tracker:
+.build-template: &build
   stage: build
   script:
     - meson . build -Db_lto=true -Db_coverage=true -Dsystemd_user_services=false -Dtests_tap_protocol=true 
--prefix /usr
@@ -122,36 +124,36 @@ build-alpine-container@x86_64:
 build-fedora-34@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .build-tracker
     - .tracker.fedora:34@x86_64
   needs:
     - build-fedora-container@x86_64
+  <<: *build
 
 build-fedora-rawhide@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .build-tracker
     - .tracker.fedora:rawhide@x86_64
   needs:
     - build-fedora-rawhide-container@x86_64
+  <<: *build
 
 build-ubuntu-rolling@x86_64:
   extends:
     - .fdo.distribution-image@ubuntu
-    - .build-tracker
     - .tracker.ubuntu:rolling@x86_64
   needs:
     - build-ubuntu-container@x86_64
+  <<: *build
 
 build-alpine-edge@x86_64:
   extends:
     - .fdo.distribution-image@alpine
-    - .build-tracker
     - .tracker.alpine:edge@x86_64
   needs:
     - build-alpine-container@x86_64
+  <<: *build
 
-.test-tracker:
+.test-template: &test
   stage: test
   variables:
     G_SLICE: "always-malloc"
@@ -188,34 +190,34 @@ build-alpine-edge@x86_64:
 test-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .test-tracker
     - .tracker.fedora:34@x86_64
   needs:
     - build-fedora-34@x86_64
+  <<: *test
 
 test-fedora-rawhide@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .test-tracker
     - .tracker.fedora:rawhide@x86_64
   needs:
     - build-fedora-rawhide@x86_64
+  <<: *test
 
 test-ubuntu@x86_64:
   extends:
     - .fdo.distribution-image@ubuntu
-    - .test-tracker
     - .tracker.ubuntu:rolling@x86_64
   needs:
     - build-ubuntu-rolling@x86_64
+  <<: *test
 
 test-alpine@x86_64:
   extends:
     - .fdo.distribution-image@alpine
-    - .test-tracker
     - .tracker.alpine:edge@x86_64
   needs:
     - build-alpine-edge@x86_64
+  <<: *build
 
 coverage-analysis:
   extends: