summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorPhil Dawson <phil.dawson@codethink.co.uk>2019-03-12 18:08:19 +0000
committerPhil Dawson <phil.dawson@codethink.co.uk>2019-03-13 14:33:19 +0000
commit4dd71edbea76c0c68b2ea4b77613e463bca1e8e0 (patch)
treea115bb620b3e1c506d3bfd54a38fba5b3094dd4d /.gitlab-ci.yml
parent2c3dfa4e1b92ead066b3fa25fe7c3037b4ba6c58 (diff)
downloadbuildstream-4dd71edbea76c0c68b2ea4b77613e463bca1e8e0.tar.gz
Move external plugin tests to seperate tox environment.
Having the external plugins in the same tox env as the internal tests is inconvenient for developers. Move the external tests into their own environment. In order to run the external tests locally, append `-external` to an environment name. For example tox -e py35-external.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a494a2b34..c4d2c864a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,9 @@ stages:
variables:
PYTEST_ADDOPTS: "--color=yes"
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
- TEST_COMMAND: "tox -- --color=yes --integration -n 2"
+ PYTEST_ARGS: "--color=yes --integration -n 2"
+ TEST_COMMAND: "tox -- ${PYTEST_ARGS}"
+ EXTERNAL_TESTS_COMMAND: "tox -e py{35,36,37}-external -- ${PYTEST_ARGS}"
COVERAGE_PREFIX: "${CI_JOB_NAME}."
@@ -38,6 +40,7 @@ variables:
# Run the tests as a simple user to test for permission issues
- su buildstream -c "${TEST_COMMAND}"
+ - su buildstream -c "${EXTERNAL_TESTS_COMMAND}"
after_script:
except: