From: Emma Foley <emma.l.foley@intel.com>
Date: Fri, 23 Mar 2018 16:48:42 +0000 (+0000)
Subject: [functest] Update kernel version check for mcelog
X-Git-Tag: opnfv-6.0.0~1^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F54405%2F3;p=barometer.git

[functest] Update kernel version check for mcelog

Change-Id: I926d0d03781a98e3509d7f9c4f4eaffc1320919b
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
---

diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 3d78762c..2723d320 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -23,6 +23,7 @@ import time
 import logging
 import config_server
 import tests
+from distutils import version
 from opnfv.deployment import factory
 
 AODH_NAME = 'aodh'
@@ -649,7 +650,7 @@ def mcelog_install():
     for node in nodes:
         if node.is_compute():
             centos_release = node.run_cmd('uname -r')
-            if centos_release not in ('3.10.0-514.26.2.el7.x86_64', '3.10.0-693.17.1.el7.x86_64'):
+            if version.LooseVersion(centos_release) < version.LooseVersion('3.10.0-514.26.2.el7.x86_64'):
                 logger.info(
                     'Mcelog will NOT be enabled on node-{}.'
                     + ' Unsupported CentOS release found ({}).'.format(