summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Falcon <TheRealFalcon@users.noreply.github.com>2021-06-17 14:02:44 -0500
committerGitHub <noreply@github.com>2021-06-17 13:02:44 -0600
commitfbcb224bc12495ba200ab107246349d802c5d8e6 (patch)
tree7b3891f1a7ea7b9e77b8db74698be225573ee1de
parent1243c5a1fc1f3546b40e48a2033a9abab546e40f (diff)
downloadvyos-cloud-init-fbcb224bc12495ba200ab107246349d802c5d8e6.tar.gz
vyos-cloud-init-fbcb224bc12495ba200ab107246349d802c5d8e6.zip
tests: Add 'adhoc' mark for integration tests (#925)
Also new jenkins tox definition
-rw-r--r--tests/integration_tests/bugs/test_gh868.py1
-rw-r--r--tox.ini11
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/integration_tests/bugs/test_gh868.py b/tests/integration_tests/bugs/test_gh868.py
index 31052dcb..838efca6 100644
--- a/tests/integration_tests/bugs/test_gh868.py
+++ b/tests/integration_tests/bugs/test_gh868.py
@@ -13,6 +13,7 @@ chef:
"""
+@pytest.mark.adhoc # Can't be regularly reaching out to chef install script
@pytest.mark.user_data(USERDATA)
def test_chef_license(client: IntegrationInstance):
log = client.read_from_file('/var/log/cloud-init.log')
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)