task: install: rpm: zypper install with --no-recommends

Since teuthology is used to automate CI testing, it is undesirable to
install anything more than is necessary to run the tests.

Fixes: https://github.com/SUSE/teuthology/issues/84
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/teuthology/task/install/rpm.py b/teuthology/task/install/rpm.py
index 6023cc075dd20363d7b6f0480d5450c9d52f1af2..766784a7ed984076940eefc9ec95c58d68f9eb41 100644 (file)
--- a/teuthology/task/install/rpm.py
+++ b/teuthology/task/install/rpm.py
@@ -134,10 +134,12 @@ def _update_package_list_and_install(ctx, remote, rpm, config):
         pkg_mng_cmd = 'zypper'
         pkg_mng_opts = '-n --no-gpg-checks'
         pkg_mng_subcommand_opts = '--capability'
+        pkg_mng_install_opts = '--no-recommends'
     else:
         pkg_mng_cmd = 'yum'
         pkg_mng_opts = '-y'
         pkg_mng_subcommand_opts = ''
+        pkg_mng_install_opts = ''
 
     for cpack in rpm:
         pkg = None
@@ -152,20 +154,22 @@ def _update_package_list_and_install(ctx, remote, rpm, config):
                       'sudo', pkg_mng_cmd, pkg_mng_opts, 'remove',
                       pkg_mng_subcommand_opts, pkg, run.Raw(';'),
                       'sudo', pkg_mng_cmd, pkg_mng_opts, 'install',
-                      pkg_mng_subcommand_opts, pkg, run.Raw(';'),
+                      pkg_mng_subcommand_opts, pkg_mng_install_opts,
+                      pkg, run.Raw(';'),
                       'fi']
             )
         if pkg is None:
             remote.run(args=[
                 'sudo', pkg_mng_cmd, pkg_mng_opts, 'install',
-                pkg_mng_subcommand_opts, cpack
+                pkg_mng_subcommand_opts, pkg_mng_install_opts, cpack
             ])
         else:
             remote.run(
                 args=['if', 'test', run.Raw('!'), '-e',
                       run.Raw(pkg), run.Raw(';'), 'then',
                       'sudo', pkg_mng_cmd, pkg_mng_opts, 'install',
-                      pkg_mng_subcommand_opts, cpack, run.Raw(';'),
+                      pkg_mng_subcommand_opts, pkg_mng_install_opts,
+                      cpack, run.Raw(';'),
                       'fi'])
 
 
@@ -323,10 +327,13 @@ def _upgrade_packages(ctx, config, remote, pkgs):
     if builder.dist_release in ['opensuse', 'sle']:
         pkg_mng_opts = '-n'
         pkg_mng_subcommand_opts = '--capability'
+        pkg_mng_install_opts = '--no-recommends'
     else:
         pkg_mng_opts = '-y'
         pkg_mng_subcommand_opts = ''
+        pkg_mng_install_opts = ''
     args = ['sudo', pkg_mng_cmd, pkg_mng_opts,
-            'install', pkg_mng_subcommand_opts]
+            'install', pkg_mng_subcommand_opts,
+            pkg_mng_install_opts]
     args += pkgs
     remote.run(args=args)