From cf9518726894af356f53130f6e12fae28b5713a8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 24 Mar 2020 15:50:57 +0100
Subject: [PATCH] ci: Update CI after the fdo template changes

The CI definition needs to be updated to work with the new fdo
templates.

Adapted from https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/bd4f118b5e14cbc01e7c2794d06a2473c040d5f5
---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb641a3..f26f8cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,9 @@ include:
 
 variables:
   extends: .libfprint_common_variables
-  FEDORA_TAG: rawhide
-  FEDORA_VERSION: rawhide
-  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG"
+  FDO_DISTRIBUTION_TAG: latest
+  FDO_DISTRIBUTION_VERSION: rawhide
+  FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
   DEPENDENCIES: dbus-glib-devel
                 gcc
                 gcovr
@@ -85,13 +85,13 @@ test_dev:
 
 # CONTAINERS creation stage
 container_fedora_build:
-  extends: .fedora@container-build
+  extends: .fdo.container-build@fedora
   only:
     variables:
       - $FPRINT_CRON_TASK == "BUILD_CI_IMAGES"
   variables:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     # a list of packages to install
-    FEDORA_RPMS:
+    FDO_DISTRIBUTION_PACKAGES:
       $DEPENDENCIES
       $LIBFPRINT_DEPENDENCIES