From e817f64ee8d7b87fce6a83f13f87ecc933a1d52e Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Wed, 21 Mar 2018 20:50:17 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c30fd29..40bab7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,32 @@
stages:
- - test:scripts
- - test:streaming_sim
- - test:telegraf_agents
+ - test
test:scripts:
- stage: test:scripts
+ stage: test
before_script:
- vagrant --fixture=scripts -- destroy --force
script:
- vagrant --fixture=scripts -- up
- vagrant --fixture=scripts -- ssh test-runner -- -tt "cd /vagrant && pytest test/scripts/"
after_script:
- - vagrant --fixture=scripts -- destroy --force
+ - vagrant --fixture=scripts -- destroy --force
when: manual
test:streaming_sim:
- stage: test:streaming_sim
+ stage: test
before_script:
- vagrant --fixture=streaming-sim -- destroy --force
script:
- vagrant --fixture=streaming-sim -- up
- vagrant --fixture=streaming-sim -- ssh test-runner -- -tt "cd /vagrant && pytest test/streaming-sim/"
after_script:
- - vagrant --fixture=streaming-sim -- destroy --force
+ - vagrant --fixture=streaming-sim -- destroy --force
+ dependencies:
+ - test:streaming_sim
when: manual
test:telegraf_agents:
- stage: test:telegraf_agents
+ stage: test
before_script:
- vagrant --fixture=telegraf-agents -- destroy --force
script:
@@ -34,6 +34,8 @@ test:telegraf_agents:
- vagrant --fixture=telegraf-agents -- ssh test-runner -- -tt "cd /vagrant && pytest test/telegraf-agents/"
after_script:
- vagrant --fixture=telegraf-agents -- destroy --force
+ dependencies:
+ - test:streaming_sim
when: manual
--
GitLab