From 4fbe5e8dc899215f216853b8569a107d8be8861d Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 17 May 2024 14:05:11 -0400 Subject: [PATCH] teuthology/task/install: conditionally merge extra_system_packages override Fixes: https://tracker.ceph.com/issues/66093 Signed-off-by: Patrick Donnelly --- teuthology/task/install/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)