summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-12-26 20:22:40 -0500
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2018-12-27 16:55:14 -0500
commit01500d175959ae4eb92e82135742164fb35369f3 (patch)
tree50448b9cbd49ffc4c9495c321f5ea8bb740922bf
parent943f6f1632475a5c0830d54115e073bf73eedabd (diff)
downloadbuildstream-tristan/use-tox.tar.gz
.gitlab-ci.yml: DO NOT MERGE - Install tox and try it in CItristan/use-tox
-rw-r--r--.gitlab-ci.yml13
1 files changed, 12 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7804f38b..2bbeb5bd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
variables:
PYTEST_ADDOPTS: "--color=yes"
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
- TEST_COMMAND: 'python3 setup.py test --index-url invalid://uri --addopts --integration'
+ TEST_COMMAND: 'tox -- --integration'
#####################################################
# Prepare stage #
@@ -72,6 +72,13 @@ source_dist:
- cd dist && ./unpack.sh
- cd buildstream
+ # Install tox
+ - pip3 install tox
+ - pip3 install tox-venv
+
+ # Install venv
+ - apt-get install python3-venv || true
+
script:
- useradd -Um buildstream
- chown -R buildstream:buildstream .
@@ -134,6 +141,10 @@ tests-unix:
- dnf mark install fuse-libs
- dnf erase -y bubblewrap ostree
+ # Install tox
+ - pip3 install tox
+ - pip3 install tox-venv
+
# Since the unix platform is required to run as root, no user change required
- ${TEST_COMMAND}