summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Singh <csingh43@bloomberg.net>2018-12-28 23:45:33 +0000
committerChandan Singh <csingh43@bloomberg.net>2018-12-29 02:36:14 +0000
commitd3d0894b5fadde9fea3abc8273de4ae89e8ccc80 (patch)
tree864b4c8c706efc3b930ecf0c594e4cf371f64a6a
parent6101bab479d4735d0eed63e8fc2a14756c433fab (diff)
downloadbuildstream-d3d0894b5fadde9fea3abc8273de4ae89e8ccc80.tar.gz
.gitlab-ci.yml: Run tests using tox
Instead of invoking tests throung `setup.py`, use `tox` as a frontend in the CI pipelines.
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7804f38b..67354abc0 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 -- --color=yes --integration'
#####################################################
# Prepare stage #
@@ -67,10 +67,10 @@ source_dist:
# Diagnostics
- mount
- df -h
-
- # Unpack
- - cd dist && ./unpack.sh
- - cd buildstream
+ # FIXME: this deps should ideally be provided by the testsuite images
+ - pip3 install tox
+ - |
+ bash -c '( apt-get update && apt-get install -y python3-dev gcc libcairo2-dev pkg-config libgirepository1.0-dev ) || ( dnf install -y gcc python3-devel gobject-introspection-devel glib2-devel cairo-gobject-devel )'
script:
- useradd -Um buildstream
@@ -83,7 +83,7 @@ source_dist:
after_script:
# Collect our reports
- mkdir -p ${COVERAGE_DIR}
- - cp dist/buildstream/.coverage ${COVERAGE_DIR}/coverage."${CI_JOB_NAME}"
+ - cp .coverage ${COVERAGE_DIR}/coverage."${CI_JOB_NAME}"
except:
- schedules
artifacts: