From: Patrick Donnelly Date: Fri, 17 May 2024 18:05:11 +0000 (-0400) Subject: teuthology/task/install: conditionally merge extra_system_packages override X-Git-Tag: 1.2.0~44^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Finstall-fix;p=teuthology.git teuthology/task/install: conditionally merge extra_system_packages override Fixes: https://tracker.ceph.com/issues/66093 Signed-off-by: Patrick Donnelly --- diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py index b8249561c..c9e13194d 100644 --- a/teuthology/task/install/__init__.py +++ b/teuthology/task/install/__init__.py @@ -571,7 +571,9 @@ def task(ctx, config): install_overrides = overrides.get('install', {}) log.debug('INSTALL overrides: %s' % install_overrides) teuthology.deep_merge(config, install_overrides.get(project, {})) - teuthology.deep_merge(extra_system_packages, install_overrides.get('extra_system_packages', {})) + overrides_extra_system_packages = install_overrides.get('extra_system_packages') + if overrides_extra_system_packages: + teuthology.deep_merge(extra_system_packages, overrides_extra_system_packages) repos = install_overrides.get('repos', None) log.debug('config %s' % config)