From 4075d9c78eee4f4bf0818836dedd127a22938a9e Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 4 Nov 2016 12:44:04 -0600 Subject: [PATCH] install: apply exclude_packages globally Previously, we were only applying the setting for upgrades Signed-off-by: Zack Cerza --- teuthology/task/install.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index bd67a8cc95..00ca2e786c 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -643,6 +643,17 @@ def get_package_list(ctx, config): if not debug: debs = filter(lambda p: not p.endswith('-dbg'), debs) rpms = filter(lambda p: not p.endswith('-debuginfo'), rpms) + + excluded_packages = config.get('exclude_packages', list()) + if excluded_packages: + log.debug("Excluding packages: {}".format(excluded_packages)) + + def exclude(pkgs): + return list(set(pkgs).difference(set(excluded_packages))) + + debs = exclude(debs) + rpms = exclude(rpms) + package_list = dict(deb=debs, rpm=rpms) log.debug("Package list is: {}".format(package_list)) return package_list @@ -1050,8 +1061,6 @@ def upgrade_common(ctx, config, deploy_style): system_type = teuthology.get_system_type(remote) assert system_type in ('deb', 'rpm') pkgs = get_package_list(ctx, config)[system_type] - excluded_packages = config.get('exclude_packages', list()) - pkgs = list(set(pkgs).difference(set(excluded_packages))) log.info("Upgrading {proj} {system_type} packages: {pkgs}".format( proj=project, system_type=system_type, pkgs=', '.join(pkgs))) # FIXME: again, make extra_pkgs distro-agnostic @@ -1354,6 +1363,7 @@ def task(ctx, config): debuginfo=config.get('debuginfo'), flavor=flavor, extra_packages=config.get('extra_packages', []), + exclude_packages=config.get('exclude_packages', []), extras=config.get('extras', None), wait_for_package=config.get('wait_for_package', False), project=project, -- 2.39.5