summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-11-18 09:48:47 -0500
committerGitHub <noreply@github.com>2020-11-18 09:48:47 -0500
commitcd752df6154c403e6dccaf5e797c1d4f8396f756 (patch)
tree3f682661fa224146cab27e67edb0afa16a0bd5f9 /tox.ini
parentf680114446a5a20ce88f3d10d966811a774c8e8f (diff)
downloadvyos-cloud-init-cd752df6154c403e6dccaf5e797c1d4f8396f756.tar.gz
vyos-cloud-init-cd752df6154c403e6dccaf5e797c1d4f8396f756.zip
only run a subset of integration tests in CI (#672)
This introduces the "ci" mark, used to indicate a test which should run as part of our CI integration testing run and the integration-tests-ci tox environment, which runs only those tests. Travis has been adjusted to use this tox environment. (All current module tests have been marked with the "ci" mark, but the one bug test that we have has not.)
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 8 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 32174dee..4320ab87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -146,6 +146,13 @@ passenv = CLOUD_INIT_*
deps =
-r{toxinidir}/integration-requirements.txt
+[testenv:integration-tests-ci]
+commands = {[testenv:integration-tests]commands}
+passenv = {[testenv:integration-tests]passenv}
+deps = {[testenv:integration-tests]deps}
+setenv =
+ PYTEST_ADDOPTS="-k ci"
+
[pytest]
# TODO: s/--strict/--strict-markers/ once xenial support is dropped
testpaths = cloudinit tests/unittests
@@ -153,6 +160,7 @@ addopts = --strict
markers =
allow_subp_for: allow subp usage for the given commands (disable_subp_usage)
allow_all_subp: allow all subp usage (disable_subp_usage)
+ ci: run this integration test as part of CI test runs
ds_sys_cfg: a sys_cfg dict to be used by datasource fixtures
ec2: test will only run on EC2 platform
gce: test will only run on GCE platform