From 389017b0f956b9511bc1bbbbb2bbc14fcd47759a Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Thu, 31 May 2018 14:28:31 +0100
Subject: [PATCH] sorting out bash ci executor is a short break from reading
proposals
---
.gitignore | 1 +
.gitlab-ci.yml | 10 ++++++----
reporc | 2 --
3 files changed, 7 insertions(+), 6 deletions(-)
delete mode 100644 reporc
diff --git a/.gitignore b/.gitignore
index 41a222f..c8d6cb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +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 d02c8ad..a4b6b68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,10 @@ build:tests:
only:
- schedules
script:
- - cd 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
@@ -45,6 +45,8 @@ 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"
diff --git a/reporc b/reporc
deleted file mode 100644
index be77640..0000000
--- a/reporc
+++ /dev/null
@@ -1,2 +0,0 @@
-REPO_USER=itinnov.flame.integration
-REPO_PASS=1tc3ntr3
--
GitLab