From 0bc2a9bb975eefa3d8cf58b88108899ab4e8a7cc Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Thu, 31 May 2018 14:54:30 +0100
Subject: [PATCH] sorting out bash ci executor is a short break from reading
proposals
---
.gitignore | 2 +-
.gitlab-ci.yml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index c8d6cb7..6430516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,4 @@ ubuntu-xenial-16.04-cloudimg-console.log
*$py.class
**/.pytest_cache/
build/
-reporc
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78a2c5d..58a0dd2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ build:tests:
- cd src/test
- python setup.py sdist --dist-dir=../../build
- cd ../../src/service
- - python setup.py sdist --dist-dir=../../build
+ - python setup.py sdist --dist-dir=../../build
artifacts:
paths:
- build/clmctest-SNAPSHOT.tar.gz
@@ -45,8 +45,8 @@ test:all:
dependencies:
- build:tests
script:
- - echo "REPO_USER=${REPO_USER}" > reporc
- - echo "REPO_PASS=${REPO_PASS}" >> reporc
+# - 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"
--
GitLab