From: Jordan Petridis <jordan@centricular.com>
Date: Wed, 21 Nov 2018 14:55:02 +0000 (+0200)
Subject: CI: Test both the ci_template as well as local changes
X-Git-Tag: 1.19.3~497^2~512
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc5ff7d8f001740b9fc092a13ca06fff31961077;p=platform%2Fupstream%2Fgstreamer.git

CI: Test both the ci_template as well as local changes

Instead of just overwritting the template build jobs, test both
so we avoid regressions.

See [1] for more

[1] https://gitlab.freedesktop.org/gstreamer/gst-ci/commit/1858a709e6d400716241c9b63dc50b28fa71c48a
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29f1449..87e9a2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,9 +93,9 @@ fedora amd64 build docker:
 
 include: "gitlab/ci_template.yml"
 
-# Overwrite the job with the same name that comes from the include template,
-# in order to use the `:latest` tag of the image built
-build fedora x86_64:
-  # This comes from the `include:` above
-  extends: .build
-  image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
\ No newline at end of file
+# Test the build job against the latest build image tag and the local manifest
+build fedora x86_64 local:
+  extends: '.build'
+  image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
+  dependencies:
+    - 'manifest'
\ No newline at end of file
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 1bfe6ba..91205a5 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -20,8 +20,6 @@ manifest:
 
 .build:
   stage: "build"
-  dependencies:
-    - "manifest"
   variables:
     CC: "ccache gcc"
     CXX: "ccache g++"
@@ -64,6 +62,8 @@ manifest:
       # - "gst-build/"
 
 build fedora x86_64:
-  extends: .build
+  extends: '.build'
   image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696'
+  dependencies:
+    - "manifest"