From: Kefu Chai <kchai@redhat.com>
Date: Sat, 28 Sep 2019 14:01:31 +0000 (+0800)
Subject: ceph.spec.in: disable "make check" for rhel8
X-Git-Tag: v14.2.10~2^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=81794e4e7b1a132ed0464d724d1af02227fa356e;p=ceph.git

ceph.spec.in: disable "make check" for rhel8

following packages are not available on RHEL/CentOS 8, they are for
dashboard unit tests. so disable all python packages for dashboard
tests for now:

python-cherrypy
python-coverage
python-pecan
python-routes
python-tox
xmlsec1-devel

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e92cb7a0336406a2981e9241031497b1749b26aa)

Conflicts:
	ceph.spec.in: trivial resolution
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 35a31d3484bca..3f5a07ee33ed5 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -205,13 +205,15 @@ BuildRequires:  librdkafka-devel
 BuildRequires:  jq
 BuildRequires:	libuuid-devel
 BuildRequires:	python%{_python_buildid}-bcrypt
-BuildRequires:	python%{_python_buildid}-coverage
 BuildRequires:	python%{_python_buildid}-nose
-BuildRequires:	python%{_python_buildid}-pecan
 BuildRequires:	python%{_python_buildid}-requests
 BuildRequires:	python%{_python_buildid}-six
-BuildRequires:	python%{_python_buildid}-tox
 BuildRequires:	python%{_python_buildid}-virtualenv
+%if 0%{?rhel} < 8
+BuildRequires:	python%{_python_buildid}-coverage
+BuildRequires:	python%{_python_buildid}-pecan
+BuildRequires:	python%{_python_buildid}-tox
+%endif
 %if 0%{?rhel} == 7
 BuildRequires:  pyOpenSSL%{_python_buildid}
 %else
@@ -286,7 +288,7 @@ BuildRequires:	lz4-devel >= 1.7
 %endif
 # distro-conditional make check dependencies
 %if 0%{with make_check}
-%if 0%{?fedora} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} == 7
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-jwt
 BuildRequires:	python%{_python_buildid}-routes