openstack
/
fuel-qa
Code Issues Proposed changes

Patch adds yum logging to the updates code 

Previously fix was added to the decorator.
This one will cover updates section

Change-Id: I79495b19d341023a5f5067379d3ead2a5b8d3075
Related-Bug:1585194
This commit is contained in:
Alexander Kurenyshev 2016-06-29 13:50:28 +03:00 committed by Alexey Stepanov
parent 502753cb05
commit 41c2818c0d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fuelweb_test/models/environment.py
View File

@ -614,31 +614,29 @@ class EnvironmentModel(object):
# then `bootstrap_admin_node.sh;` # then `bootstrap_admin_node.sh;`
def admin_install_updates(self): def admin_install_updates(self):
logger.info('Searching for updates..') logger.info('Searching for updates..')
update_command = 'yum clean expire-cache; yum update -y' update_command = 'yum clean expire-cache && ' \
'yum update -y 2>>/var/log/yum-update-error.log'
update_result = self.ssh_manager.execute( logger.info('Performing yum clean and update commands')
update_result = self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip, ip=self.ssh_manager.admin_ip,
cmd=update_command cmd=update_command,
) err_msg='Packages update failed, inspect logs for details')
logger.info('Result of "{1}" command on master node: ' logger.info('Packages were updated successfully')
'{0}'.format(update_result, update_command))
assert_equal(int(update_result['exit_code']), 0,
'Packages update failed, '
'inspect logs for details')
# Check if any packets were updated and update was successful # Check if any packets were updated and update was successful
yum_output = ''.join(update_result['stdout'])
match_updated_count = re.search(r'Upgrade\s+(\d+)\s+Package', match_updated_count = re.search(r'Upgrade\s+(\d+)\s+Package',
yum_output) update_result['stdout_str'])
# In case of package replacement, the new one is marked as # In case of package replacement, the new one is marked as
# installed and the old one as removed # installed and the old one as removed
match_installed_count = re.search(r'Install\s+(\d+)\s+Package', match_installed_count = re.search(r'Install\s+(\d+)\s+Package',
yum_output) update_result['stdout_str'])
match_complete_message = re.search(r'Complete!', yum_output) match_complete_message = re.search(r'Complete!',
update_result['stdout_str'])
match_no_updates = re.search("No Packages marked for Update", match_no_updates = re.search("No Packages marked for Update",
yum_output) update_result['stdout_str'])
if match_no_updates or not match_complete_message \ if match_no_updates or not match_complete_message \
or not (match_updated_count or match_installed_count): or not (match_updated_count or match_installed_count):