From 79e6366dc27a96400c7d2923574b27e2d2ecb85e Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Sat, 2 Jun 2018 21:42:51 +0100
Subject: [PATCH] ci for givry
---
.gitlab-ci.yml | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8311bc..d014c97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,17 +45,20 @@ test:all:
dependencies:
- build:tests
script:
-# - echo "REPO_USER=${REPO_USER}" > reporc
-# - echo "REPO_PASS=${REPO_PASS}" >> reporc
- - 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"
- - vagrant --fixture=monitoring -- up
- - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pip3 install /vagrant/build/clmcservice-SNAPSHOT.tar.gz"
- - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.monitoring"
- - vagrant --fixture=monitoring -- ssh test-runner -- -tt "pytest -s --pyargs clmcservice.tests"
- - vagrant --fixture=inputs -- up
- - vagrant --fixture=inputs -- ssh test-runner -- -tt "pytest -s --pyargs clmctest.inputs"
+ - echo "REPO_USER=${REPO_USER}" > reporc
+ - echo "REPO_PASS=${REPO_PASS}" >> reporc
+ - sudo /vagrant/scripts/test/fixtures.sh create -f /vagrant/src/test/clmctest/rspec.json
+ - sudo lxc-attach -n test-runner
+ - cd /vagrant/src/test
+ - python setup.py sdist --dist-dir=../../build
+ - cd ../../src/service
+ - python setup.py sdist --dist-dir=../../build
+ - pip3 install /vagrant/build/clmctest-SNAPSHOT.tar.gz
+ - pip3 install /vagrant/build/clmcservice-SNAPSHOT.tar.gz
+ - pytest -s --pyargs clmctest.scripts
+ - pytest -s --pyargs clmcservice.tests
+ - pytest -s --pyargs clmctest.inputs
+ - pytest -s --pyargs clmctest.monitoring
when: on_success
clean:
@@ -63,5 +66,5 @@ clean:
only:
- schedules
script:
- - python scripts/test/deleteallvms.py
- when: always
\ No newline at end of file
+ - sudo /vagrant/scripts/test/fixtures.sh destroy -f /vagrant/src/test/clmctest/rspec.json
+ when: always
--
GitLab