diff --git a/.gitignore b/.gitignore index 41a222fbf2524a14c492ebf90a68f1f5fdf3df7f..c8d6cb72c310a31a84fe8f5a02cf9403bb615067 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 d02c8ad0b8714011745e3186520fddf13cffb080..a4b6b688b87a792c388d9df44b6e644ce024c6d0 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 be776406af2eb5f1baa0e3ae73d4861351b84a0d..0000000000000000000000000000000000000000 --- a/reporc +++ /dev/null @@ -1,2 +0,0 @@ -REPO_USER=itinnov.flame.integration -REPO_PASS=1tc3ntr3