[gtk/ebassi/ci-master: 3/3] ci: Update the CI images

[Emmanuele Bassi <ebassi src gnome org>]

commit 207e59448afc5e38703e618333fba81211a413a3
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Jun 8 11:00:20 2020 +0100

    ci: Update the CI images

 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f9cd0f906..cc9121c548 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,9 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v18"
+  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
 
 .only-default:
   only:
@@ -27,14 +30,14 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: $FEDORA_IMAGE
   stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: $FEDORA_IMAGE
   artifacts:
     when: always
     reports:
@@ -117,7 +120,7 @@ msys2-mingw32:
     CHERE_INVOKING: "yes"
 
 .flatpak-defaults:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -171,7 +174,7 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
 
 static-scan:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: $FEDORA_IMAGE
   stage: analysis
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
@@ -184,7 +187,7 @@ static-scan:
   allow_failure: true
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19
+  image: $DOCS_IMAGE
   stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"