Merge PR #1943 into main

* refs/pull/1943/head: teuthology/task/install: conditionally merge extra_system_packages override Reviewed-by: Vallari Agrawal <[email protected]>
ceph · May 18, 2024 · b9e3da8 · b9e3da8
2 parents bb9e32d + 4fbe5e8
commit b9e3da8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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)