From 29208b97456228db87f286850db444a40a9344aa Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Tue, 27 Mar 2018 17:27:43 +0100
Subject: [PATCH] on_failure to clean up
---
.gitlab-ci.yml | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4baa51c..5084e83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
stages:
- build
- test
- - clean
build:tests:
stage: build
@@ -23,15 +22,9 @@ test:all:
- vagrant --fixture=monitoring -- up
- vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"
- vagrant --fixture=inputs -- up
- - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"
- when: on_success
-
-clean:
- stage: clean
- dependencies:
- - test:all
- script:
+ - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"
+ after_script:
- vagrant --fixture=inputs -- destroy --force
- vagrant --fixture=monitoring -- destroy --force
- - vagrant --fixture=scripts -- destroy --force
- when: always
\ No newline at end of file
+ - vagrant --fixture=scripts -- destroy --force
+ when: on_success
--
GitLab