[gnome-settings-daemon/benzea/master-gsettings-desktop-schemas: 4/4] ci: Separate shared variables to *docker_common_variables



commit baa6cb04c334210c775b0114a66913acf8eeb246
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Fri Nov 29 21:34:39 2019 +0100

    ci: Separate shared variables to *docker_common_variables

 .gitlab-ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ff7da48..68982062 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,6 +179,11 @@ msan:
 #############################################
 #          Create CI Docker Images          #
 #############################################
+.Docker common variables: &docker_common_variables
+  # https://about.gitlab.com/blog/2019/07/31/docker-in-docker-with-docker-19-dot-03/
+  DOCKER_TLS_CERTDIR: ""
+  DOCKER_DRIVER: overlay
+
 .Docker image template: &create_docker_image
   image: docker:latest
   stage: delivery
@@ -220,18 +225,14 @@ msan:
 fedora.dev:
   <<: *create_docker_image
   variables:
-    # https://about.gitlab.com/blog/2019/07/31/docker-in-docker-with-docker-19-dot-03/
-    DOCKER_TLS_CERTDIR: ""
-    DOCKER_DRIVER: overlay
+    <<: *docker_common_variables
     DOCKERFILE: "build-aux/ci/Dockerfile.fedora.rawhide"
     NAME: "fedora.dev"
 
 fedora.aarch64:
   <<: *create_docker_image
   variables:
-    # https://about.gitlab.com/blog/2019/07/31/docker-in-docker-with-docker-19-dot-03/
-    DOCKER_TLS_CERTDIR: ""
-    DOCKER_DRIVER: overlay
+    <<: *docker_common_variables
     DOCKERFILE: "build-aux/ci/Dockerfile.arm64v8.fedora.rawhide"
     NAME: "fedora.aarch64"
     TARGET_ARCH: "aarch64"
@@ -239,9 +240,7 @@ fedora.aarch64:
 fedora.ppc64le:
   <<: *create_docker_image
   variables:
-    # https://about.gitlab.com/blog/2019/07/31/docker-in-docker-with-docker-19-dot-03/
-    DOCKER_TLS_CERTDIR: ""
-    DOCKER_DRIVER: overlay
+    <<: *docker_common_variables
     DOCKERFILE: "build-aux/ci/Dockerfile.ppc64le.fedora.rawhide"
     NAME: "fedora.ppc64le"
     TARGET_ARCH: "ppc64le"


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