summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-10-13 14:54:31 +0200
committerHerman van Rink2017-10-13 16:21:16 +0200
commit2c372f8708b59b8e116e31d9042d23421e5dff6f (patch)
tree9424daf45757c9fae00825a160359f1b33add5af
parentac3ed3478b2e308772a5d84a931bd01527116d83 (diff)
manual jobs should not all be allowed to fail.
-rw-r--r--.gitlab-ci.yml9
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5da04bb..821dd60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,14 +62,17 @@ build:deb:
### Stage "test"
#
+
test:debian-jessie-aegir3-apt:
stage: test
image: debian:jessie
+ allow_failure: false
dependencies:
- build:deb
when: manual
except:
- 7.x-3.x
+ - /^7\.x-3\.\d+\.x/
before_script:
- apt-get update
@@ -83,7 +86,7 @@ test:debian-jessie-aegir3-apt:
test:debian-stretch-aegir3-apt:
stage: test
image: debian:stretch
- allow_failure: true
+ allow_failure: false
dependencies:
- build:deb
@@ -99,12 +102,14 @@ test:debian-stretch-aegir3-apt:
test:ubuntu-xenial-aegir3-apt:
stage: test
image: ubuntu:xenial
+ allow_failure: false
dependencies:
- build:deb
when: manual
except:
- 7.x-3.x
+ - /^7\.x-3\.\d+\.x/
before_script:
- apt-get update
@@ -172,7 +177,6 @@ publish:unstable-repo:
stage: publish
dependencies:
- build:deb
- allow_failure: true
only:
- 7.x-3.x
@@ -210,6 +214,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
image: debian:jessie
dependencies:
- publish:unstable-repo
+ allow_failure: false
when: manual