From fd54451e327c54ad353f4fe91ad82d20567aeea5 Mon Sep 17 00:00:00 2001 From: MJB <mjb@it-innovation.soton.ac.uk> Date: Wed, 28 Mar 2018 07:07:04 +0100 Subject: [PATCH] split tests as they were taking too long on castan and hitting timeout of 60, increased time out to 120 as well --- .gitlab-ci.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5084e83..9a601de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,9 @@ stages: - build - - test + - test:scripts + - test:monitoring + - test:inputs + - clean build:tests: stage: build @@ -11,20 +14,40 @@ build:tests: - build/clmctest-SNAPSHOT.tar.gz expire_in: 1 day -test:all: - stage: test +test:scripts: + stage: test:scripts dependencies: - build:tests script: - vagrant --fixture=scripts -- up - vagrant --fixture=scripts -- ssh test-runner -- -tt "pip3 install /vagrant/build/clmctest-SNAPSHOT.tar.gz" - vagrant --fixture=scripts -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.scripts" + when: on_success + +test:monitoring: + stage: test:monitoring + dependencies: + - test:scripts + script: - vagrant --fixture=monitoring -- up - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring" + when: on_success + +test:inputs: + stage: test:inputs + dependencies: + - test:monitoring + script: - vagrant --fixture=inputs -- up - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs" + when: on_success + +clean:test: + stage: clean + script: + - echo "Clean VMs" after_script: - vagrant --fixture=inputs -- destroy --force - vagrant --fixture=monitoring -- destroy --force - vagrant --fixture=scripts -- destroy --force - when: on_success + when: always \ No newline at end of file -- GitLab