From e89fad1455d7d54353dda42993fc8fdef9e1a246 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Fri, 23 Nov 2018 18:45:31 +0200
Subject: [PATCH] gitlab/ci_template.yml: rework the CI stages

Idea is that in order to not consume many resources for broken
builds, we will have a basic stage where just one simple set of
build and test jobs is run. If that passes we will continue with
the rest of the Pipeline suite.
---
 .gitlab-ci.yml         | 11 ++++++++---
 gitlab/ci_template.yml | 14 ++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93419cc..52c371c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,19 @@
 stages:
-  - "test"
   - "build runtime"
   - "build base"
-  - "manifest"
+  - "preparation"
+  # Test just one basic build, if succeds procced to test the rest
   - "build"
+  - "test"
+  # Run multiple builds and tests, multi-distro, multi-arch
+  - "full builds"
+  - "full tests"
 
 test manifest:
   variables:
     GIT_STRATEGY: fetch
   image: "fedora"
-  stage: "test"
+  stage: "preparation"
   before_script:
     - dnf install -y python3-pytest python3-pytest-cov python3-requests
   script:
@@ -122,6 +126,7 @@ include: "gitlab/ci_template.yml"
 # Test the build job against the latest build image tag and the local manifest
 build fedora x86_64 local:
   extends: '.build'
+  stage: 'build'
   image: "${CI_REGISTRY_IMAGE}/amd64/fedora-build:latest"
 
 build ubuntu x86_64 local:
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 4e5ddf0..5b66b6b 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -1,6 +1,11 @@
 stages:
-  - "manifest"
-  - "build"
+  - 'preparation'
+  # Test just one basic build, if it succeeds proceed to test the rest
+  - 'build'
+  - 'test'
+  # Run multiple builds and tests, multi-distro, multi-arch
+  - 'full builds'
+  - 'full tests'
 
 variables:
   GIT_STRATEGY: none
@@ -17,7 +22,7 @@ variables:
 
 manifest:
   image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/alpine-manifest-build:10ffa6f1af6fed20a8857d2c7426d81cf162e3d1'
-  stage: 'manifest'
+  stage: 'preparation'
   script:
     - cd /gst-ci
     - gitlab/build_manifest.py --self-update
@@ -29,7 +34,7 @@ manifest:
       - "manifest.xml"
 
 .build:
-  stage: "build"
+  stage: 'full builds'
   dependencies:
     - "manifest"
   variables:
@@ -66,6 +71,7 @@ manifest:
 
 build fedora x86_64:
   extends: '.build'
+  stage: 'build'
   image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora-build:2414895a53408ed8a0410a52560f8090b3f74696'
 
 build android arm64 api28:
-- 
2.7.4