From 712eeccd4bbc46525ac9c4d5a138368b7a0ddd7a Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Mon, 26 Mar 2018 21:40:59 +0100
Subject: [PATCH] pip3 and commit ref name test
---
.gitlab-ci.yml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b418e2b..ee7b963 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,27 @@
stages:
- build
-<<<<<<< HEAD
- test
-=======
- - test:scripts
- - test:monitoring
- - test:inputs
->>>>>>> 7b4334bb2ab788e29ddde9098efcba96c0447112
build:tests:
stage: build
script:
- python setup.py sdist --dist-dir=build
+ - echo $CI_COMMIT_REF_NAME
test:
stage: test
script:
- vagrant --fixture=scripts -- up
- - vagrant --fixture=scripts -- ssh test-runner -- -tt "cd /vagrant && pytest clmctest/scripts/"
+ - vagrant --fixture=scripts -- ssh test-runner -- -tt "pip3 install /vagrant/build/clmctest-$CI_COMMIT_REF_NAME.tar.gz"
+ - vagrant --fixture=scripts -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.scripts"
- vagrant --fixture=monitoring -- up
- - vagrant --fixture=monitoring -- ssh test-runner -- -tt "cd /vagrant && pytest clmctest/monitoring/"
+ - vagrant --fixture=scripts -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"
- vagrant --fixture=inputs -- up
- - vagrant --fixture=inputs -- ssh test-runner -- -tt "cd /vagrant && pytest clmctest/inputs/"
+ - vagrant --fixture=scripts -- 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: on_success
+ when: manual
\ No newline at end of file
--
GitLab