From 75533fa7a0f1d6a20df4a0b83b0f3327556a4891 Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Sat, 2 Jun 2018 21:59:08 +0100
Subject: [PATCH] sudo updates
---
.gitlab-ci.yml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edbfcd7..36f6a03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,8 @@ build:tests:
only:
- schedules
script:
- - cd src/test
+ - echo $CI_PROJECT_DIR
+ - cd ${CI_PROJECT_DIR}/src/test
- python setup.py sdist --dist-dir=../../build
- cd ../../src/service
- python setup.py sdist --dist-dir=../../build
@@ -44,18 +45,18 @@ test:all:
- schedules
dependencies:
- build:tests
- script:
- - echo "REPO_USER=${REPO_USER}" > reporc
- - echo "REPO_PASS=${REPO_PASS}" >> reporc
+ script:
+ - echo "REPO_USER=${REPO_USER}" > $CI_PROJECT_DIR/reporc
+ - echo "REPO_PASS=${REPO_PASS}" >> $CI_PROJECT_DIR/reporc
- sudo su
- - /vagrant/scripts/test/fixtures.sh create -f /vagrant/src/test/clmctest/rspec.json
+ - scripts/test/fixtures.sh create -f src/test/clmctest/rspec.json -r $CI_PROJECT_DIR
- lxc-attach -n test-runner
- - cd /vagrant/src/test
+ - cd 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
+ - pip3 install $CI_PROJECT_DIR//build/clmctest-SNAPSHOT.tar.gz
+ - pip3 install $CI_PROJECT_DIR/clmcservice-SNAPSHOT.tar.gz
- pytest -s --pyargs clmctest.scripts
- pytest -s --pyargs clmcservice.tests
- pytest -s --pyargs clmctest.inputs
--
GitLab