[glib: 1/6] ci: Use variables for docker images



commit 5daad373a33d9a6610bf16cdf86db0e947bfc935
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Mon Jan 13 12:45:00 2020 -0500

    ci: Use variables for docker images

 .gitlab-ci.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc6810716..46d750435 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,10 @@ cache:
     - _ccache/
 
 variables:
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v5"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v5"
+  ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v1"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v1"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings"
@@ -22,7 +26,7 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v5
+  image: $DEBIAN_IMAGE
   stage: style-check
   allow_failure: true
   script:
@@ -30,7 +34,7 @@ style-check-diff:
 
 fedora-x86_64:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: build
   variables:
     CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
@@ -64,7 +68,7 @@ fedora-x86_64:
 
 debian-stable-x86_64:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v5
+  image: $DEBIAN_IMAGE
   stage: build
   script:
     - meson ${MESON_COMMON_OPTIONS}
@@ -92,7 +96,7 @@ debian-stable-x86_64:
 
 installed-tests:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: build
   before_script:
     # FIXME move to docker image
@@ -151,7 +155,7 @@ installed-tests:
 
 G_DISABLE_ASSERT:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: build
   variables:
     CPPFLAGS: "-DG_DISABLE_ASSERT"
@@ -178,7 +182,7 @@ G_DISABLE_ASSERT:
 
 valgrind:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: analysis
   variables:
     MESON_TEST_TIMEOUT_MULTIPLIER: 10
@@ -220,7 +224,7 @@ valgrind:
 
 cross-android_api21_arm64:
   <<: *cross-template
-  image: registry.gitlab.gnome.org/gnome/glib/android-ndk:v1
+  image: $ANDROID_IMAGE
   script:
     # FIXME: add --werror
     # We use -Diconv=auto to test that we successfully detect that iconv is not
@@ -230,7 +234,7 @@ cross-android_api21_arm64:
 
 cross-android_api28_arm64:
   <<: *cross-template
-  image: registry.gitlab.gnome.org/gnome/glib/android-ndk:v1
+  image: $ANDROID_IMAGE
   script:
     # FIXME: add --werror
     - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_28.txt -Dinternal_pcre=true 
_build
@@ -238,7 +242,7 @@ cross-android_api28_arm64:
 
 cross-mingw64:
   <<: *cross-template
-  image: registry.gitlab.gnome.org/gnome/glib/mingw:v1
+  image: $MINGW_IMAGE
   script:
     # FIXME: Add --werror
     - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build
@@ -378,7 +382,7 @@ macos:
 
 coverage:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: coverage
   artifacts:
     name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
@@ -390,7 +394,7 @@ coverage:
 
 scan-build:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: analysis
   script:
     - meson ${MESON_COMMON_OPTIONS}
@@ -421,7 +425,7 @@ pages:
       - public
 
 dist-job:
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
+  image: $FEDORA_IMAGE
   stage: build
   only:
     - tags


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]