From e265f788cc5726c285442fdad511d4d966203f9d Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Sat, 2 Jun 2018 22:05:54 +0100
Subject: [PATCH] sudo updates
---
.gitlab-ci.yml | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fc29c4..611d0cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,10 +29,10 @@ build:tests:
- schedules
script:
- 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
+ - cd $CI_PROJECT_DIR/src/test
+ - python setup.py sdist --dist-dir=$CI_PROJECT_DIR/build
+ - cd $CI_PROJECT_DIR/src/service
+ - python setup.py sdist --dist-dir=$CI_PROJECT_DIR/build
artifacts:
paths:
- build/clmctest-SNAPSHOT.tar.gz
@@ -49,18 +49,13 @@ test:all:
- echo "REPO_USER=${REPO_USER}" > $CI_PROJECT_DIR/reporc
- echo "REPO_PASS=${REPO_PASS}" >> $CI_PROJECT_DIR/reporc
- sudo su
- - $CI_PROJECT_DIR/scripts/test/fixtures.sh create -f $CI_PROJECT_DIR/src/test/clmctest/rspec.json -r $CI_PROJECT_DIR
- - lxc-attach -n test-runner
- - cd src/test
- - python setup.py sdist --dist-dir=../../build
- - cd ../../src/service
- - python setup.py sdist --dist-dir=../../build
- - 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
- - pytest -s --pyargs clmctest.monitoring
+ - scripts/test/fixture.sh create -f src/test/clmctest/rspec.json -r $CI_PROJECT_DIR
+ - lxc-attach -n test-runner -- pip3 install $CI_PROJECT_DIR//build/clmctest-SNAPSHOT.tar.gz
+ - lxc-attach -n test-runner -- pip3 install $CI_PROJECT_DIR/clmcservice-SNAPSHOT.tar.gz
+ - lxc-attach -n test-runner -- pytest -s --pyargs clmctest.scripts
+ - lxc-attach -n test-runner -- pytest -s --pyargs clmcservice.tests
+ - lxc-attach -n test-runner -- pytest -s --pyargs clmctest.inputs
+ - lxc-attach -n test-runner -- pytest -s --pyargs clmctest.monitoring
when: on_success
clean:
--
GitLab