From 7f5d9c27579aec3eefe6a48eec5c3b25c1443439 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Fri, 22 Feb 2019 15:52:08 +0000
Subject: [PATCH] gitlab-ci: always run the containers build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the first time a fork was created, the job creating the containers was
manually cancelled, this would have left the fork unable to use the CI
(until the next automatic regeneration of the container).

Avoid this by always running the container-generation job, even though
99% of the time it will spin up, see that the container exists and shut
down.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---
 .gitlab-ci.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ac1be258c6..3cb16edccd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,9 +29,18 @@ stages:
   - build+test
 
 
+# When to automatically run the CI
+.ci-run-policy:
+  only:
+    - master
+    - merge_requests
+    - /^ci([-/].*)?$/
+
+
 # CONTAINERS
 
 containers:ubuntu:
+  extends: .ci-run-policy
   stage: containers-build
   image: docker:stable
   services:
@@ -52,21 +61,14 @@ containers:ubuntu:
       docker image push $UBUNTU_IMAGE && exit || true
     - docker build -t $UBUNTU_IMAGE -f .gitlab-ci/Dockerfile.ubuntu .
     - docker push $UBUNTU_IMAGE
-  only:
-    changes:
-      - .gitlab-ci.yml
-      - .gitlab-ci/Dockerfile.ubuntu
 
 
 # BUILD
 
 .build:
+  extends: .ci-run-policy
   image: $UBUNTU_IMAGE
   stage: build+test
-  only:
-    - master
-    - merge_requests
-    - /^ci([-/].*)?$/
   artifacts:
     when: on_failure
     untracked: true