Merge "Add test_k8s_dashboard test"
diff --git a/tcp_tests/fixtures/runtest_fixtures.py b/tcp_tests/fixtures/runtest_fixtures.py
index 4609915..ddeced2 100644
--- a/tcp_tests/fixtures/runtest_fixtures.py
+++ b/tcp_tests/fixtures/runtest_fixtures.py
@@ -23,7 +23,6 @@
Run tempest tests
"""
tempest_threads = settings.TEMPEST_THREADS
- tempest_exclude_test_args = settings.TEMPEST_EXCLUDE_TEST_ARGS
tempest_pattern = settings.TEMPEST_PATTERN
cluster_name = settings.LAB_CONFIG_NAME
domain_name = settings.DOMAIN_NAME
@@ -33,7 +32,6 @@
cluster_name=cluster_name,
domain_name=domain_name,
tempest_threads=tempest_threads,
- tempest_exclude_test_args=tempest_exclude_test_args,
tempest_pattern=tempest_pattern,
target=target)
return runtest
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index b24cba2..c400556 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -102,8 +102,8 @@
class_name = "runtest"
run_cmd = '/bin/bash -c "run-tempest"'
- def __init__(self, underlay, salt_api, cluster_name, domain_name,
- tempest_threads, tempest_exclude_test_args,
+ def __init__(self, underlay, salt_api, cluster_name,
+ domain_name, tempest_threads,
tempest_pattern=settings.TEMPEST_PATTERN,
run_cmd=None, target='gtw01'):
self.underlay = underlay
@@ -112,7 +112,6 @@
self.cluster_name = cluster_name
self.domain_name = domain_name
self.tempest_threads = tempest_threads
- self.tempest_exclude_test_args = tempest_exclude_test_args
self.tempest_pattern = tempest_pattern
self.run_cmd = run_cmd or self.run_cmd
@@ -244,11 +243,9 @@
"image": "{}:{}".format(self.image_name, self.image_version),
"environment": {
"ARGS": "-r {tempest_pattern} -w "
- "{tempest_threads} "
- "{tempest_exclude_test_args}".format(
+ "{tempest_threads} ".format(
tempest_pattern=self.tempest_pattern,
- tempest_threads=self.tempest_threads,
- tempest_exclude_test_args=self.tempest_exclude_test_args) # noqa
+ tempest_threads=self.tempest_threads) # noqa
},
"binds": [
"{cfg_dir}/tempest.conf:/etc/tempest/tempest.conf".format(cfg_dir=TEMPEST_CFG_DIR), # noqa
diff --git a/tcp_tests/settings.py b/tcp_tests/settings.py
index fcbe1a9..1f69850 100644
--- a/tcp_tests/settings.py
+++ b/tcp_tests/settings.py
@@ -79,8 +79,5 @@
TEMPEST_PATTERN = os.environ.get('TEMPEST_PATTERN', 'tempest')
TEMPEST_TIMEOUT = int(os.environ.get('TEMPEST_TIMEOUT', 60 * 60 * 5))
TEMPEST_THREADS = int(os.environ.get('TEMPEST_THREADS', 2))
-TEMPEST_EXCLUDE_TEST_ARGS = os.environ.get(
- 'TEMPEST_EXCLUDE_TEST_ARGS',
- '--blacklist-file mcp_pike_lvm_skip.list')
TEMPEST_TARGET = os.environ.get('TEMPEST_TARGET', 'gtw01')
SALT_VERSION = os.environ.get('SALT_VERSION', '2017.7')
diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 7613a2c..037dbd8 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -336,6 +336,8 @@
help="", default=False),
ct.Cfg('kubernetes_virtlet_image', ct.String(),
help="", default='mirantis/virtlet:v1.1.0'),
+ ct.Cfg('kubernetes_dns', ct.Boolean(),
+ help="", default=True),
ct.Cfg('kubernetes_externaldns_enabled', ct.Boolean(),
help="", default=False),
ct.Cfg('kubernetes_externaldns_image', ct.String(),
diff --git a/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml b/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml
index 88f6543..3833315 100644
--- a/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-trusty/openstack.yaml
@@ -51,6 +51,12 @@
retry: {count: 1, delay: 5}
skip_fail: true
+- description: Restart libvirtd on compute nodes (PROD-23034)
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' service.restart libvirtd
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
- description: Check IP on computes
cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' cmd.run
'ip a'