[gnome-settings-daemon/benzea/update-ci-template: 2/2] ci: Update to adjust fdo template changes and switch to rawhide

[Benjamin Berg <bberg src gnome org>]

commit 3db025d74fbf3fabfe2d9d8547c88a8ada1cb3a0
Author: Benjamin Berg <bberg redhat com>
Date:   Tue Mar 17 09:49:54 2020 +0100

    ci: Update to adjust fdo template changes and switch to rawhide
    
    The used template was changed. Also switch back to rawhide as it is
    working again now (requiring a dependency update).

 .gitlab-ci.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c881459a..a4a2699c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,10 @@ include:
  - remote: 'https://gitlab.freedesktop.org/wayland/ci-templates/raw/master/templates/fedora.yml'
 
 variables:
-  # Use F31 for now as the base image needs updating for the new keys
-  FEDORA_TAG: latest
-  FEDORA_VERSION: 31
+  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/$FEDORA_VERSION:$FEDORA_TAG"
+  FEDORA_IMAGE: "$CI_REGISTRY/gnome/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
   FEDORA_DEPENDENCIES: >
     @c-development
     alsa-lib-devel
@@ -46,7 +45,7 @@ variables:
     perl-interpreter
     polkit-devel
     pulseaudio-libs-devel
-    pygobject3 python3-dbusmock
+    python3-gobject python3-dbusmock
     umockdev
     upower-devel
     wayland-devel
@@ -239,7 +238,7 @@ msan:
 #############################################
 
 container_fedora_build:
-  extends: .fedora@container-build
+  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
   only:
@@ -247,8 +246,8 @@ container_fedora_build:
       - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    FEDORA_RPMS: $FEDORA_DEPENDENCIES
-    FEDORA_EXEC: |
+    FDO_DISTRIBUTION_PACKAGES: $FEDORA_DEPENDENCIES
+    FDO_DISTRIBUTION_EXEC: |
       git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \
         cd gsettings-desktop-schemas && \
         meson . _build --prefix=/usr && \