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

[Benjamin Berg <bberg src gnome org>]

commit 8c0078936345fa1c74c2cf14807e8fbb66f422b6
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 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4a2699c..346f189e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,13 @@
 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
+  FEDORA_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
+  FDO_EXPIRES_AFTER: 8w
   FEDORA_DEPENDENCIES: >
     @c-development
     alsa-lib-devel
@@ -214,6 +216,8 @@ pages:
 
 asan:
   <<: *sanitizer
+  # ASAN requires debugging capabilities
+  tags: [ privileged ]
   variables:
     BUILD_OPTS: "-Db_sanitize=address"
 
@@ -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 && \