diff options
author | Tom Pollard <tom.pollard@codethink.co.uk> | 2019-12-12 15:53:10 +0000 |
---|---|---|
committer | Tom Pollard <tom.pollard@codethink.co.uk> | 2019-12-18 10:38:32 +0000 |
commit | e1a9d9489c587f4230d82e9944ace30aa2cab078 (patch) | |
tree | 267c35a958d89f7fd439246ce182ddc1c4dbf77e | |
parent | 8a746a58a7f41244560bcc8ca44d80c5d25d8ab6 (diff) | |
download | buildstream-e1a9d9489c587f4230d82e9944ace30aa2cab078.tar.gz |
Add pytest timeout to ci
-rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c605bdac..8247e54f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: DOCKER_IMAGE_VERSION: master-103717922 PYTEST_ADDOPTS: "--color=yes" INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache" - PYTEST_ARGS: "--color=yes --integration -n 2" + PYTEST_ARGS: "--color=yes --timeout=300 --integration -n 2" TEST_COMMAND: "tox -- ${PYTEST_ARGS}" EXTERNAL_TESTS_COMMAND: "tox -e py35-external,py36-external,py37-external -- ${PYTEST_ARGS}" COVERAGE_PREFIX: "${CI_JOB_NAME}." |