teuthology/task/install: apply extra_system_packages overrides

Currently the install task requires these to be defined only in the definition
of the install task itself. Overrides are ignored.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py
index 0f1bb63dacab49cc11db4a4833ccb8e43107055a..b8249561c0bfbb34e3cae2fcb062b7c78243586d 100644 (file)
--- a/teuthology/task/install/__init__.py
+++ b/teuthology/task/install/__init__.py
@@ -565,11 +565,15 @@ def task(ctx, config):
     log.debug('project %s' % project)
     overrides = ctx.config.get('overrides')
     repos = None
+    extra_system_packages = config.get('extra_system_packages', [])
+
     if overrides:
         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', {}))
         repos = install_overrides.get('repos', None)
-        log.debug('INSTALL overrides: %s' % install_overrides)
+
     log.debug('config %s' % config)
 
     rhbuild = None
@@ -603,7 +607,7 @@ def task(ctx, config):
                 downgrade_packages=config.get('downgrade_packages', []),
                 exclude_packages=config.get('exclude_packages', []),
                 extra_packages=config.get('extra_packages', []),
-                extra_system_packages=config.get('extra_system_packages', []),
+                extra_system_packages=extra_system_packages,
                 extras=config.get('extras', None),
                 enable_coprs=config.get('enable_coprs', []),
                 flavor=flavor,