openstack/fuel-qa
Code Issues Proposed changes

Merge "Add upgading of mcollective agent while upgrading cluster" into stable/mitaka

Browse Source
This commit is contained in:
Jenkins 2016-11-14 11:23:29 +00:00 committed by Gerrit Code Review
commit 5739779be6
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuelweb_test/tests/tests_upgrade/test_os_upgrade.py
View File

@ -28,8 +28,7 @@ class TestOSupgrade(OSUpgradeBase):
super(TestOSupgrade, self).__init__() super(TestOSupgrade, self).__init__()
self.old_cluster_name = self.cluster_names["ceph_ha"] self.old_cluster_name = self.cluster_names["ceph_ha"]
@test(depends_on_groups=['upgrade_ceph_ha_restore'], @test(groups=["os_upgrade_env"])
groups=["os_upgrade_env"])
@log_snapshot_after_test @log_snapshot_after_test
def os_upgrade_env(self): def os_upgrade_env(self):
"""Octane clone target environment """Octane clone target environment
@ -49,6 +48,8 @@ class TestOSupgrade(OSUpgradeBase):
self.env.sync_time(["admin"]) self.env.sync_time(["admin"])
self.env.sync_time() self.env.sync_time()
self.upgrade_mcollective_agents()
self.install_octane() self.install_octane()
release_id = self.upgrade_release(use_net_template=False) release_id = self.upgrade_release(use_net_template=False)

25
fuelweb_test/tests/tests_upgrade/upgrade_base.py
View File

@ -19,11 +19,13 @@ from __future__ import unicode_literals
from distutils.version import LooseVersion from distutils.version import LooseVersion
# pylint: enable=no-name-in-module # pylint: enable=no-name-in-module
# pylint: enable=import-error # pylint: enable=import-error
import re
from proboscis.asserts import assert_equal from proboscis.asserts import assert_equal
from proboscis.asserts import assert_not_equal from proboscis.asserts import assert_not_equal
from proboscis.asserts import assert_true from proboscis.asserts import assert_true
from proboscis import SkipTest from proboscis import SkipTest
import requests
import six import six
from fuelweb_test import logger from fuelweb_test import logger
@ -131,6 +133,29 @@ class OSUpgradeBase(DataDrivenUpgradeBase):
for cmd in cmds: for cmd in cmds:
admin_remote.check_call(cmd) admin_remote.check_call(cmd)
def upgrade_mcollective_agents(self):
"""Upgrade mcollective agent on nodes according to upgrade runbook;
This actions WILL NOT be automated by octane
"""
# Fetch latest available package
astute_deb_location = "http://mirror.fuel-infra.org/mos-repos/" \
"ubuntu/snapshots/9.0-latest/pool/main/a/astute"
repo_content = requests.get(astute_deb_location).content
mco_package = re.findall('>(nailgun-mcagents_.*all\.deb)',
repo_content)[-1]
# Update package on each node; use curl for predictable file name
nodes = self.fuel_web.client.list_cluster_nodes(self.orig_cluster_id)
for node in nodes:
d_node = self.fuel_web.get_devops_node_by_nailgun_node(node)
remote = self.fuel_web.get_ssh_for_node(node_name=d_node.name)
remote.check_call("curl {repo}/{pkg} > {pkg}".format(
repo=astute_deb_location,
pkg=mco_package))
with remote.sudo():
remote.check_call("dpkg -i {pkg}".format(pkg=mco_package))
remote.check_call("service mcollective restart")
def upgrade_release(self, use_net_template=False): def upgrade_release(self, use_net_template=False):
self.show_step(self.next_step) self.show_step(self.next_step)