ci: Move images into environment variables

Currently we have to hunt all the `image` keys when updating the image
in use for a job. We should centralise them all at the top of the file,
so they are easy to update in one simple change.
This commit is contained in:
Emmanuele Bassi 2020-06-08 11:00:20 +01:00
parent ceb63b83f2
commit 86562a6c5a

View File

@ -18,6 +18,9 @@ stages:
variables: variables:
COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror" COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
MESON_TEST_TIMEOUT_MULTIPLIER: 2 MESON_TEST_TIMEOUT_MULTIPLIER: 2
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17"
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-default:
only: only:
@ -27,14 +30,14 @@ variables:
style-check-diff: style-check-diff:
extends: .only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17 image: $FEDORA_IMAGE
stage: .pre stage: .pre
allow_failure: true allow_failure: true
script: script:
- .gitlab-ci/run-style-check-diff.sh - .gitlab-ci/run-style-check-diff.sh
.build-fedora-default: .build-fedora-default:
image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17 image: $FEDORA_IMAGE
artifacts: artifacts:
when: always when: always
reports: reports:
@ -117,7 +120,7 @@ msys2-mingw64:
CHERE_INVOKING: "yes" CHERE_INVOKING: "yes"
.flatpak-defaults: .flatpak-defaults:
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master image: $FLATPAK_IMAGE
stage: flatpak stage: flatpak
allow_failure: true allow_failure: true
tags: tags:
@ -171,7 +174,7 @@ flatpak-master:icon-browser:
APPID: org.gtk.IconBrowser4 APPID: org.gtk.IconBrowser4
static-scan: static-scan:
image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16 image: $FEDORA_IMAGE
stage: analysis stage: analysis
variables: variables:
EXTRA_MESON_FLAGS: "--buildtype=debug" EXTRA_MESON_FLAGS: "--buildtype=debug"
@ -184,7 +187,7 @@ static-scan:
allow_failure: true allow_failure: true
reference: reference:
image: registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19 image: $DOCS_IMAGE
stage: docs stage: docs
variables: variables:
EXTRA_MESON_FLAGS: "--buildtype=release" EXTRA_MESON_FLAGS: "--buildtype=release"