From ae80b863c346174c8c8e4fbdc7c637151c590d9a Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Tue, 12 Mar 2019 21:33:58 -0400
Subject: [PATCH] gitlab: Move cerbero jobs in gst-ci

This will allow extending the CI at one place.
---
 .gitlab-ci.yml         |  6 ++--
 gitlab/ci_template.yml | 75 ++++++++++++++++++++++++++++++------------
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8812467577..1e79df29a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,7 +138,7 @@ build android 28 local:
       - "master@gstreamer/gst-ci"
 
 build cerbero fedora x86_64 local:
-  extends: '.build cerbero fedora x86_64'
+  extends: '.cerbero fedora x86_64'
   image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
   when: 'manual'
   except:
@@ -146,7 +146,7 @@ build cerbero fedora x86_64 local:
       - "master@gstreamer/gst-ci"
 
 build cerbero cross win32 local:
-  extends: '.build cerbero cross win32'
+  extends: '.cerbero cross win32'
   image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
   when: 'manual'
   except:
@@ -154,7 +154,7 @@ build cerbero cross win32 local:
       - "master@gstreamer/gst-ci"
 
 build cerbero cross win64 local:
-  extends: '.build cerbero cross win64'
+  extends: '.cerbero cross win64'
   image: "${CI_REGISTRY_IMAGE}/amd64/cerbero-fedora:latest"
   when: 'manual'
   except:
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 1eea2611bb..23ec2fd1a1 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -358,48 +358,81 @@ check fedora:
 #
 # Cerbero Linux X86_64 build
 #
-.build cerbero fedora x86_64:
-  extends: '.cerbero'
-  variables:
-    CONFIG: "linux.config"
-
-.cerbero deps fedora x86_64:
+cerbero deps fedora x86_64:
   extends: '.cerbero deps'
   variables:
     CONFIG: "linux.config"
     ARCH: "linux_x86_64"
 
-# This indirection allow overriding the image without passing again CONFIG
+.cerbero fedora x86_64:
+  extends: '.cerbero'
+  variables:
+    CONFIG: "linux.config"
+
+cerbero fedora x86_64:
+  extends: '.cerbero fedora x86_64'
+  dependencies:
+    - "cerbero deps fedora x86_64"
+  only:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
 build cerbero fedora x86_64:
-  extends: '.build cerbero fedora x86_64'
+  extends: '.cerbero fedora x86_64'
+  except:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
 
 #
 # Cerbero Cross Windows builds
 #
-.build cerbero cross win32:
-  extends: '.cerbero'
-  variables:
-    CONFIG: "cross-win32.cbc"
-
-.cerbero deps cross win32:
+cerbero deps windows x86:
   extends: '.cerbero deps'
   variables:
     CONFIG: "cross-win32.cbc"
     ARCH: "windows_x86"
 
-build cerbero cross win32:
-  extends: '.build cerbero cross win32'
-
-.build cerbero cross win64:
+.cerbero cross win32:
   extends: '.cerbero'
   variables:
-    CONFIG: "cross-win64.cbc"
+    CONFIG: "cross-win32.cbc"
 
-.cerbero deps cross win64:
+cerbero cross win32:
+  extends: '.cerbero cross win32'
+  dependencies:
+    - "cerbero deps windows x86"
+  only:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
+build cerbero cross win32:
+  extends: '.cerbero cross win32'
+  except:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
+cerbero deps windows x86_64:
   extends: '.cerbero deps'
   variables:
     CONFIG: "cross-win64.cbc"
     ARCH: "windows_x86_64"
 
+.cerbero cross win64:
+  extends: '.cerbero'
+  variables:
+    CONFIG: "cross-win64.cbc"
+
+cerbero cross win64:
+  extends: '.cerbero cross win64'
+  dependencies:
+    - "cerbero deps windows x86_64"
+  only:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"
+
 build cerbero cross win64:
-  extends: '.build cerbero cross win64'
+  extends: '.cerbero cross win64'
+  except:
+    variables:
+      - $CI_PROJECT_NAME == "cerbero"