summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 10 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 9374a1cb..f21e1186 100644
--- a/tox.ini
+++ b/tox.ini
@@ -157,7 +157,15 @@ passenv = CLOUD_INIT_* SSH_AUTH_SOCK OS_* TRAVIS
deps =
-r{toxinidir}/integration-requirements.txt
setenv =
- PYTEST_ADDOPTS="-m ci"
+ PYTEST_ADDOPTS="-m ci and not adhoc"
+
+[testenv:integration-tests-jenkins]
+commands = {envpython} -m pytest --log-cli-level=INFO {posargs:tests/integration_tests}
+passenv = CLOUD_INIT_* SSH_AUTH_SOCK OS_*
+deps =
+ -r{toxinidir}/integration-requirements.txt
+setenv =
+ PYTEST_ADDOPTS="-m not adhoc"
[pytest]
# TODO: s/--strict/--strict-markers/ once xenial support is dropped
@@ -190,3 +198,4 @@ markers =
sru_next: test is part of the next SRU verification
ubuntu: this test should run on Ubuntu
unstable: skip this test because it is flakey
+ adhoc: only run on adhoc basis, not in any CI environment (travis or jenkins)