Add HA test "kill keepalived, haproxy"
- also added time sync on '*' minions
after reverting snapshot in the salt_deployed fixture;
and after making a snapshot in the other fixtures
Change-Id: Ia5c5363bf55399422785f66e88e861c23cfab531
diff --git a/tcp_tests/fixtures/ceph_fixtures.py b/tcp_tests/fixtures/ceph_fixtures.py
index c294542..0b2ef50 100644
--- a/tcp_tests/fixtures/ceph_fixtures.py
+++ b/tcp_tests/fixtures/ceph_fixtures.py
@@ -40,7 +40,7 @@
@pytest.fixture(scope='function')
def ceph_deployed(revert_snapshot, request, config,
hardware, underlay, common_services_deployed,
- ceph_actions):
+ salt_deployed, ceph_actions):
"""Fixture to get or install Ceph services on environment
:param revert_snapshot: fixture that reverts snapshot that is specified
@@ -72,6 +72,7 @@
commands = underlay.read_template(steps_path)
ceph_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.ceph_deployed)
+ salt_deployed.sync_time()
else:
# 1. hardware environment created and powered on
diff --git a/tcp_tests/fixtures/common_services_fixtures.py b/tcp_tests/fixtures/common_services_fixtures.py
index 5d4c56a..7d1c73f 100644
--- a/tcp_tests/fixtures/common_services_fixtures.py
+++ b/tcp_tests/fixtures/common_services_fixtures.py
@@ -71,6 +71,7 @@
commands = underlay.read_template(steps_path)
common_services_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.common_services_deployed)
+ salt_deployed.sync_time()
else:
# 1. hardware environment created and powered on
diff --git a/tcp_tests/fixtures/decapod_fixtures.py b/tcp_tests/fixtures/decapod_fixtures.py
index 7f064c5..8e40b41 100644
--- a/tcp_tests/fixtures/decapod_fixtures.py
+++ b/tcp_tests/fixtures/decapod_fixtures.py
@@ -68,6 +68,7 @@
commands = underlay.read_template(steps_path)
decapod_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.decapod_deployed)
+ salt_deployed.sync_time()
else:
# 1. hardware environment created and powered on
diff --git a/tcp_tests/fixtures/k8s_fixtures.py b/tcp_tests/fixtures/k8s_fixtures.py
index 3cacbaf..356a51b 100644
--- a/tcp_tests/fixtures/k8s_fixtures.py
+++ b/tcp_tests/fixtures/k8s_fixtures.py
@@ -38,7 +38,7 @@
@pytest.mark.revert_snapshot(ext.SNAPSHOT.k8s_deployed)
@pytest.fixture(scope='function')
def k8s_deployed(revert_snapshot, request, config, hardware, underlay,
- common_services_deployed, k8s_actions):
+ common_services_deployed, salt_deployed, k8s_actions):
"""Fixture to get or install k8s on environment
:param revert_snapshot: fixture that reverts snapshot that is specified
@@ -71,6 +71,7 @@
commands = underlay.read_template(steps_path)
k8s_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.k8s_deployed)
+ salt_deployed.sync_time()
# Workaround for keepalived hang issue after env revert from snapshot
# see https://mirantis.jira.com/browse/PROD-12038
diff --git a/tcp_tests/fixtures/openstack_fixtures.py b/tcp_tests/fixtures/openstack_fixtures.py
index 1926299..8e92e77 100644
--- a/tcp_tests/fixtures/openstack_fixtures.py
+++ b/tcp_tests/fixtures/openstack_fixtures.py
@@ -41,7 +41,7 @@
@pytest.fixture(scope='function')
def openstack_deployed(revert_snapshot, request, config,
hardware, underlay, common_services_deployed,
- openstack_actions, rally):
+ salt_deployed, openstack_actions, rally):
"""Fixture to get or install OpenStack services on environment
:param revert_snapshot: fixture that reverts snapshot that is specified
@@ -99,6 +99,7 @@
rally.run_container()
hardware.create_snapshot(ext.SNAPSHOT.openstack_deployed)
+ salt_deployed.sync_time()
else:
# 1. hardware environment created and powered on
diff --git a/tcp_tests/fixtures/oss_fixtures.py b/tcp_tests/fixtures/oss_fixtures.py
index d46427b..a74313b 100644
--- a/tcp_tests/fixtures/oss_fixtures.py
+++ b/tcp_tests/fixtures/oss_fixtures.py
@@ -68,6 +68,7 @@
commands = underlay.read_template(steps_path)
oss_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.oss_deployed)
+ salt_deployed.sync_time()
else:
# 1. hardware environment created and powered on
diff --git a/tcp_tests/fixtures/salt_fixtures.py b/tcp_tests/fixtures/salt_fixtures.py
index d72b1fc..aff28dc 100644
--- a/tcp_tests/fixtures/salt_fixtures.py
+++ b/tcp_tests/fixtures/salt_fixtures.py
@@ -78,6 +78,7 @@
for n in config.underlay.ssh)]
hardware.create_snapshot(ext.SNAPSHOT.salt_deployed)
+ salt_actions.sync_time()
else:
# 1. hardware environment created and powered on
@@ -87,4 +88,6 @@
# installed TCP API endpoint
pass
+ salt_actions.sync_time()
+
return salt_actions
diff --git a/tcp_tests/fixtures/stacklight_fixtures.py b/tcp_tests/fixtures/stacklight_fixtures.py
index 8028383..c1747b8 100644
--- a/tcp_tests/fixtures/stacklight_fixtures.py
+++ b/tcp_tests/fixtures/stacklight_fixtures.py
@@ -39,7 +39,7 @@
@pytest.fixture(scope='function')
def sl_deployed(revert_snapshot, request, config,
hardware, underlay, common_services_deployed,
- sl_actions):
+ salt_deployed, sl_actions):
"""Fixture to get or install SL services on environment
:param revert_snapshot: fixture that reverts snapshot that is specified
@@ -57,6 +57,7 @@
commands = underlay.read_template(steps_path)
sl_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.sl_deployed)
+ salt_deployed.sync_time()
else:
# 1. hardware environment created and powered on