From c62f89fd752c97e331c09557147791cedf50cd2d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 13 Jun 2019 09:45:29 -0400 Subject: [PATCH] qa/rgw: skip swift tests on rhel 7.6+ swift bootstrap fails because libev-devel is not available Fixes: http://tracker.ceph.com/issues/40304 Signed-off-by: Casey Bodley --- qa/tasks/swift.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py index 1966ced3407..ef3027a7060 100644 --- a/qa/tasks/swift.py +++ b/qa/tasks/swift.py @@ -8,6 +8,7 @@ import contextlib import logging import os +from packaging import version from teuthology import misc as teuthology from teuthology import contextutil from teuthology.config import config as teuth_config @@ -231,15 +232,22 @@ def task(ctx, config): config = all_clients if isinstance(config, list): config = dict.fromkeys(config) - clients = config.keys() - - log.info('clients={c}'.format(c=clients)) testswift_conf = {} - for client in clients: + clients = [] + for client in config.keys(): endpoint = ctx.rgw.role_endpoints.get(client) assert endpoint, 'swift: no rgw endpoint for {}'.format(client) + # http://tracker.ceph.com/issues/40304 can't bootstrap on rhel 7.6+ + (remote,) = ctx.cluster.only(client).remotes.keys() + os_version = version.parse(remote.os.version): + if remote.os.type == 'rhel' and os_version >= version.Version('7.6'): + log.warning('Swift tests cannot run on rhel 7.6+, skipping client {client}'.format(client)) + continue + + clients.append(client) + testswift_conf[client] = ConfigObj( indent_type='', infile={ @@ -252,6 +260,7 @@ def task(ctx, config): } ) + log.info('clients={c}'.format(c=config.keys())) with contextutil.nested( lambda: download(ctx=ctx, config=config), lambda: create_users(ctx=ctx, config=dict(