From: Mr NeilBrown <neilb@suse.de>
Date: Mon, 12 Dec 2022 04:51:59 +0000 (+1100)
Subject: LU-16382 spec: add more dependencies for lustre-tests
X-Git-Tag: 2.15.56~200
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7521473bdd;p=fs%2Flustre-release.git

LU-16382 spec: add more dependencies for lustre-tests

Without these packages/tools, the lustre sanity.sh test suite can fail
unexpectedly.

If dbench or iozone are absent the relevant tests are skipped rather
than failing, so that can be Recommends.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: Ib30731cdb11525e4f8875734314cc955f8fe1ae4
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49368
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Aurelien Degremont <adegremont@nvidia.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index c7cd213..05547e4 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -391,6 +391,13 @@ Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 Requires: python3 >= 3.6.0
 %endif
 Requires: attr, rsync, perl, lsof, /usr/bin/getconf
+Requires: /usr/sbin/getenforce, /usr/bin/netstat, acl, /usr/bin/killall, /usr/bin/ping, bc
+# Of the supported targets, only rhel7 doesn't support Recommends.
+%if 0%{?rhel} > 7 || 0%{?rhel} < 1
+Recommends: dbench, iozone
+# Either of these is sufficient
+Suggests: pdsh, clush
+%endif
 %if %{with mpi}
 %if "%{mpi_name}" == "mpich"
 BuildRequires: mpich-devel