[gnome-build-meta/abderrahim/misc-ci-improvements: 2/3] .gitlab-ci.yml: move architecture specific settings to a separate file

[Abderrahim Kitouni <akitouni src gnome org>]

commit e130e5ee669f10f2c5c12a5f3f7255e4c6842903
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Aug 4 19:33:44 2020 +0100

    .gitlab-ci.yml: move architecture specific settings to a separate file

 .gitlab-ci.yml      | 53 ++---------------------------------------------------
 .gitlab-ci/arch.yml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 51 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 479c1e8e..139f8b26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+include: .gitlab-ci/arch.yml
+
 variables:
   # Store all the bst stuff under the "${CI_PROJECT_DIR}" directory.
   # Note that GitLab CI will only cache stuff inside the "${CI_PROJECT_DIR}" folder.
@@ -9,13 +11,6 @@ variables:
   BST: "bst $BST_STRICT --config build.conf --log-file logs/build.log --colors"
   FLATPAK_BRANCH: master
 
-  # Docker Images
-  DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
-  DOCKER_IMAGE_ID: "e60e2dccd1ac4e928d62472676762d8e3e4a1406"
-  DOCKER_AMD64: "${DOCKER_REGISTRY}/bst14/amd64:${DOCKER_IMAGE_ID}"
-  DOCKER_AARCH64: "${DOCKER_REGISTRY}/bst14/arm64:${DOCKER_IMAGE_ID}"
-  DOCKER_PPC64LE: "${DOCKER_REGISTRY}/bst14/ppc64le:${DOCKER_IMAGE_ID}"
-
 stages:
 - track
 - build
@@ -188,50 +183,6 @@ default:
   - flat-manager-client push $(cat build.txt) repo/ $(ostree --repo=repo/ refs)
   rules: *flatpak-publish-rules
 
-#
-# Architecture specific settings
-#
-
-.x86_64:
-  image: "${DOCKER_AMD64}"
-  tags:
-  - x86_64
-  - gnome-build-meta
-  variables:
-    ARCH: x86_64
-
-.i686:
-  image: "${DOCKER_AMD64}"
-  tags:
-  - x86_64
-  - gnome-build-meta
-  variables:
-    ARCH: i686
-
-.aarch64:
-  image: "${DOCKER_AARCH64}"
-  tags:
-  - aarch64
-  - gnome-build-meta
-  variables:
-    ARCH: aarch64
-
-.arm:
-  image: "${DOCKER_AARCH64}"
-  tags:
-  - armhf
-  - gnome-build-meta
-  variables:
-    ARCH: arm
-
-.ppc64le:
-  image: "${DOCKER_PPC64LE}"
-  tags:
-  - ppc64le
-  - gnome-build-meta
-  variables:
-    ARCH: ppc64le
-  allow_failure: true
 
 #
 # "Real" CI jobs
diff --git a/.gitlab-ci/arch.yml b/.gitlab-ci/arch.yml
new file mode 100644
index 00000000..727fb797
--- /dev/null
+++ b/.gitlab-ci/arch.yml
@@ -0,0 +1,53 @@
+variables:
+  # Docker Images
+  DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
+  DOCKER_IMAGE_ID: "e60e2dccd1ac4e928d62472676762d8e3e4a1406"
+
+  DOCKER_AMD64: "${DOCKER_REGISTRY}/bst14/amd64:${DOCKER_IMAGE_ID}"
+  DOCKER_AARCH64: "${DOCKER_REGISTRY}/bst14/arm64:${DOCKER_IMAGE_ID}"
+  DOCKER_PPC64LE: "${DOCKER_REGISTRY}/bst14/ppc64le:${DOCKER_IMAGE_ID}"
+
+#
+# Architecture specific settings
+#
+
+.x86_64:
+  image: "${DOCKER_AMD64}"
+  tags:
+  - x86_64
+  - gnome-build-meta
+  variables:
+    ARCH: x86_64
+
+.i686:
+  image: "${DOCKER_AMD64}"
+  tags:
+  - x86_64
+  - gnome-build-meta
+  variables:
+    ARCH: i686
+
+.aarch64:
+  image: "${DOCKER_AARCH64}"
+  tags:
+  - aarch64
+  - gnome-build-meta
+  variables:
+    ARCH: aarch64
+
+.arm:
+  image: "${DOCKER_AARCH64}"
+  tags:
+  - armhf
+  - gnome-build-meta
+  variables:
+    ARCH: arm
+
+.ppc64le:
+  image: "${DOCKER_PPC64LE}"
+  tags:
+  - ppc64le
+  - gnome-build-meta
+  variables:
+    ARCH: ppc64le
+  allow_failure: true