[gnome-build-meta/abderrahim/ci-improvements: 81/84] .gitlab-ci.yml: factor out architecture specific settings

[Abderrahim Kitouni <akitouni src gnome org>]

commit 6828b9d027e1af86e13922e8d7fcf6908be2097f
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sun Jan 13 12:45:34 2019 +0100

    .gitlab-ci.yml: factor out architecture specific settings

 .gitlab-ci.yml | 103 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 51 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e09fdde..de7d029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,6 +86,10 @@ before_script:
 
     fi
 
+#
+# Templates shared by multiple jobs
+#
+
 .cache-template:
   # Store all the downloaded sources in the distributed cache. This saves
   # us fetching them from the different repos and further afield
@@ -137,28 +141,11 @@ before_script:
       - logs
       - project.refs
 
+#
+# Architecture specific settings
+#
 
-track:
-  extends: .cache-template
-  image: buildstream/buildstream-fedora:master-123-abef70fe
-  stage: track
-  script:
-    - ${BST} track --deps all core.bst flatpak-runtimes.bst
-  tags:
-    - x86_64
-    - gnome-build-meta
-  # don't run on stable branches
-  except:
-    - /^gnome-\d-\d\d$/
-  artifacts:
-    when: always
-    paths:
-      - logs
-      - project.refs
-
-
-build-gnome-core-x86_64:
-  extends: .build-template
+.x86_64: &x86_64
   image: buildstream/buildstream-fedora:master-123-abef70fe
   tags:
     - x86_64
@@ -166,8 +153,7 @@ build-gnome-core-x86_64:
   variables:
     ARCH: x86_64
 
-build-gnome-core-i386:
-  extends: .build-template
+.i686: &i686
   image: buildstream/buildstream-fedora:master-123-abef70fe
   tags:
     - x86_64
@@ -175,8 +161,7 @@ build-gnome-core-i386:
   variables:
     ARCH: i686
 
-build-gnome-core-aarch64:
-  extends: .build-template
+.aarch64: &aarch64
   image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
   tags:
     - aarch64
@@ -184,8 +169,7 @@ build-gnome-core-aarch64:
   variables:
     ARCH: aarch64
 
-build-gnome-core-arm:
-  extends: .build-template
+.arm: &arm
   image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
   tags:
     - armhf
@@ -193,38 +177,55 @@ build-gnome-core-arm:
   variables:
     ARCH: arm
 
+#
+# "Real" CI jobs
+#
+
+track:
+  extends: .cache-template
+  <<: *x86_64
+  stage: track
+  script:
+    - ${BST} track --deps all core.bst flatpak-runtimes.bst
+  # don't run on stable branches
+  except:
+    - /^gnome-\d-\d\d$/
+  artifacts:
+    when: always
+    paths:
+      - logs
+      - project.refs
+
+
+build-gnome-core-x86_64:
+  extends: .build-template
+  <<: *x86_64
+
+build-gnome-core-i386:
+  extends: .build-template
+  <<: *i686
+
+build-gnome-core-aarch64:
+  extends: .build-template
+  <<: *aarch64
+
+build-gnome-core-arm:
+  extends: .build-template
+  <<: *arm
+
+
 flatpak-x86_64:
   extends: .flatpak-template
-  image: buildstream/buildstream-fedora:master-123-abef70fe
-  tags:
-    - x86_64
-    - gnome-build-meta
-  variables:
-    ARCH: x86_64
+  <<: *x86_64
 
 flatpak-i386:
   extends: .flatpak-template
-  image: buildstream/buildstream-fedora:master-123-abef70fe
-  tags:
-    - x86_64
-    - gnome-build-meta
-  variables:
-    ARCH: i686
+  <<: *i686
 
 flatpak-aarch64:
   extends: .flatpak-template
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
-  tags:
-    - aarch64
-    - gnome-build-meta
-  variables:
-    ARCH: aarch64
+  <<: *aarch64
 
 flatpak-arm:
   extends: .flatpak-template
-  image: buildstream/buildstream-fedora:aarch64-master-123-abef70fe
-  tags:
-    - armhf
-    - gnome-build-meta
-  variables:
-    ARCH: arm
+  <<: *arm