x/stacklight-integration-tests
Code Issues Proposed changes

Merge "Redeploy nodes in post-deploy test only for MOS 8"

Browse Source
This commit is contained in:
Jenkins 2016-06-17 12:46:12 +00:00 committed by Gerrit Code Review
commit ed96a13688
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stacklight_tests/helpers/helpers.py
View File

@ -559,3 +559,7 @@ class PluginHelper(object):
start = time.time() start = time.time()
raise TimeoutException("Timed out waiting to become {}".format( raise TimeoutException("Timed out waiting to become {}".format(
expected_status)) expected_status))
def get_fuel_release(self):
version = self.nailgun_client.get_api_version()
return version.get('release')

11
stacklight_tests/toolchain/test_post_install.py
View File

@ -71,6 +71,8 @@ class TestToolchainPostInstallation(api.ToolchainApi):
3. Configure the plugins 3. Configure the plugins
4. Add 3 nodes with the plugin roles 4. Add 3 nodes with the plugin roles
5. Deploy the cluster 5. Deploy the cluster
6. Redeploy the nodes that existed before the last deploy (MOS 8
only)
6. Check that LMA Toolchain plugins are running 6. Check that LMA Toolchain plugins are running
7. Run OSTF 7. Run OSTF
@ -90,10 +92,13 @@ class TestToolchainPostInstallation(api.ToolchainApi):
'slave-04': settings.stacklight_roles, 'slave-04': settings.stacklight_roles,
'slave-05': settings.stacklight_roles 'slave-05': settings.stacklight_roles
}) })
if self.helpers.get_fuel_release() == '8.0':
# The 'hiera' and post-deployment tasks have to be re-executed # The 'hiera' and post-deployment tasks have to be re-executed
# "manually" for the existing nodes # "manually" for the existing nodes on MOS 8. With later versions
self.helpers.run_tasks(existing_nodes, tasks=['hiera'], # of MOS, these tasks should be re-executed automatically.
start="post_deployment_start", timeout=20 * 60) self.helpers.run_tasks(
existing_nodes, tasks=['hiera'], start="post_deployment_start",
timeout=20 * 60)
self.check_plugins_online() self.check_plugins_online()