From 2926b6784227e8b7259dab5097680bb85f75dd1f Mon Sep 17 00:00:00 2001
From: Marek Szuba <marek.szuba@ebi.ac.uk>
Date: Mon, 18 Nov 2019 11:43:08 +0000
Subject: [PATCH] .gitlab-ci-yml: Trigger dependent jobs in the test stage
Seeing as they were to run even in the event of any of the local
test jobs having failed, no real point in waiting until after the local
jobs have completed.
---
.gitlab-ci.yml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aa0349372..3230a55aa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-stages:
- - test
- - posttest
-
#
# Test-job template
#
@@ -75,9 +71,7 @@ test:perl5.30-mysql:
# downstream branches) - but then again, we do not trigger dependent
# builds for PRs on Travis either.
.dependent_template:
- stage: posttest
- # We want this to run even if any test jobs fail
- when: always
+ stage: test
only:
- master
- /^release/\d+$/
@@ -87,7 +81,7 @@ test:perl5.30-mysql:
# ensembl-rest; disabled for now because that repo a) hasn't got
# GitLab-CI config yet, and b) is still on the list in
# trigger-dependent-build.sh.
-.post:trigger_rest:
+.test:trigger_rest:
extends: .dependent_template
trigger:
project: ensembl-gh-mirror/ensembl-rest
@@ -101,7 +95,7 @@ test:perl5.30-mysql:
# is the Travis 'create_request' permission but Travis permissions are
# generated from GitHub ones and it seems that in order to have
# 'create_request' on the latter one requires 'write' on the former.
-post:trigger_travis:
+test:trigger_travis:
extends: .dependent_template
image: alpine:3.10
variables:
--
GitLab