diff options
| author | Chandan Singh <chandan@chandansingh.net> | 2020-01-14 23:20:10 +0000 |
|---|---|---|
| committer | Chandan Singh <chandan@chandansingh.net> | 2020-01-14 23:20:10 +0000 |
| commit | e3fde756567166c7ed2fdcacd883ae3b0530e909 (patch) | |
| tree | 409c41b60e8554f1ae99a2e619c3fac6b65b2e1d | |
| parent | d8ed22837b9f3e827fdb6f9c18f4c06c75fe0e1f (diff) | |
| parent | afc92dc8a9fc9e30aa6db19172ba8df32e097438 (diff) | |
| download | buildstream-e3fde756567166c7ed2fdcacd883ae3b0530e909.tar.gz | |
Merge branch 'chandan/gitlab-ci-toxenvs' into 'master'
.gitlab-ci.yml: Simplify test environment declaration
See merge request BuildStream/buildstream!1795
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5133a86a..6ab79e131 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache" PYTEST_ARGS: "--color=yes --integration -n 2" TEST_COMMAND: "tox -- ${PYTEST_ARGS}" - PLUGINS_TESTS_COMMAND: "tox -e py35-plugins,py36-plugins,py37-plugins -- ${PYTEST_ARGS}" + TOXENV: py35, py36, py37, py38, py35-plugins, py36-plugins, py37-plugins, py38-plugins COVERAGE_PREFIX: "${CI_JOB_NAME}." @@ -55,7 +55,6 @@ variables: # Run the tests as a simple user to test for permission issues - su buildstream -c "${TEST_COMMAND}" - - su buildstream -c "${PLUGINS_TESTS_COMMAND}" after_script: except: @@ -99,8 +98,7 @@ tests-python-3.8-buster: # Our testsuite has issues with coverage on Python 3.8 so disable coverage # in the meantime. For more details, see # https://gitlab.com/BuildStream/buildstream/issues/1173. - TEST_COMMAND: "tox -e py38-nocover -- ${PYTEST_ARGS}" - PLUGINS_TESTS_COMMAND: "tox -e py38-plugins-nocover -- ${PYTEST_ARGS}" + TOXENV: py38-nocover,py38-plugins-nocover # Test the master version of some external plugins tests-plugins-master: @@ -159,7 +157,6 @@ tests-userchroot: # Run the tests as a simple user to test for permission issues - su buildstream -c "umask 002 && ${TEST_COMMAND}" - - su buildstream -c "umask 002 && ${PLUGINS_TESTS_COMMAND}" tests-fedora-missing-deps: # Ensure that tests behave nicely while missing bwrap and ostree |