[gnome-settings-daemon/benzea/update-ci-template: 10/10] ci: Update CI to use newer fdo templates

[Benjamin Berg <bberg src gnome org>]

commit 8b595fd1816d6b69e3af496f5b7e41052ae0f57f
Author: Benjamin Berg <bberg redhat com>
Date:   Thu May 7 10:41:13 2020 +0200

    ci: Update CI to use newer fdo templates

 .gitlab-ci.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4a2699c..c64dab20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,12 @@
 include:
- - remote: 'https://gitlab.freedesktop.org/wayland/ci-templates/raw/master/templates/fedora.yml'
+ - remote: 
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/59de540b620c45739871d1a073d76d5521989d11/templates/fedora.yml'
 
 variables:
   FDO_DISTRIBUTION_TAG: latest
   FDO_DISTRIBUTION_VERSION: rawhide
-  # NOTE: We hardcode /gnome/ so that forks pick up the correct registry
-  FEDORA_IMAGE: "$CI_REGISTRY/gnome/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
+  FDO_UPSTREAM_REPO: gnome/gnome-settings-daemon
+  # Expiry sets fdo.expires on the image
+  FDO_EXPIRES_AFTER: 8w
   FEDORA_DEPENDENCIES: >
     @c-development
     alsa-lib-devel
@@ -54,8 +55,6 @@ variables:
     xorg-x11-server-Xvfb
     xorg-x11-utils mutter
 
-image: "$FEDORA_IMAGE"
-
 stages:
   - build
   - test
@@ -99,6 +98,7 @@ stages:
 # any of them.
 ##
 build:
+  extends: .fdo.distribution-image@fedora
   <<: *save_untracked_files
   stage: build
 
@@ -125,6 +125,7 @@ build:
 # Runs the unit tests.
 ##
 test:
+  extends: .fdo.distribution-image@fedora
   <<: *save_build_logs
   stage: test
 
@@ -152,6 +153,7 @@ test:
 
 # Runs the coverage test.
 coverage:
+  extends: .fdo.distribution-image@fedora
   <<: *save_build_logs
   stage: test
   # Appears to be broken on Fedora Rawhide as of 2018-02-05
@@ -180,6 +182,7 @@ coverage:
 # Publishes the Coverage Report generated above
 ##
 pages:
+  extends: .fdo.distribution-image@fedora
   stage: delivery
   # Don't error in case coverage failed
   allow_failure: true
@@ -199,6 +202,7 @@ pages:
 # Runs the sanitizers [address, thread, undefined, and memory].
 ##
 .sanitizer: &sanitizer
+  extends: .fdo.distribution-image@fedora
   <<: *save_build_logs
   stage: manual
   when: manual
@@ -237,15 +241,18 @@ msan:
 #          Create CI Docker Images          #
 #############################################
 
+# See also https://gitlab.freedesktop.org/freedesktop/ci-templates
 container_fedora_build:
+  tags: [ privileged ]
   extends: .fdo.container-build@fedora
   # The templates reference the local registry, but we need the fdo one
-  image: registry.freedesktop.org/wayland/ci-templates/buildah:latest
+  image: registry.freedesktop.org/freedesktop/ci-templates/buildah:2020-03-24
   only:
     variables:
       - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
+    FDO_FORCE_REBUILD: 1 # Force rebuilding the image
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_DEPENDENCIES
     FDO_DISTRIBUTION_EXEC: |
       git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \