From d4b1b76cb6ef4f7c472d7a5ab31045113ec24e83 Mon Sep 17 00:00:00 2001 From: MJB <mjb@it-innovation.soton.ac.uk> Date: Wed, 28 Mar 2018 09:47:50 +0100 Subject: [PATCH] Updated executable --- .gitlab-ci.yml | 2 +- scripts/build/deleteallvms.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86fcfd2..ce2b843 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ test:all: - 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: manual + when: on_success clean: stage: clean diff --git a/scripts/build/deleteallvms.sh b/scripts/build/deleteallvms.sh index 06196df..4c68a7a 100755 --- a/scripts/build/deleteallvms.sh +++ b/scripts/build/deleteallvms.sh @@ -6,5 +6,7 @@ while read vm_id; do echo $vm_id vboxmanage controlvm $vm_id poweroff vboxmanage unregistervm $vm_id --delete -done <runningvms +done <runningvms + +rm runningvms -- GitLab