]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: disable "make check" for rhel8
authorKefu Chai <kchai@redhat.com>
Sat, 28 Sep 2019 14:01:31 +0000 (22:01 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 28 Sep 2019 14:20:35 +0000 (22:20 +0800)
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>
ceph.spec.in

index 3757bdf6682af9ffe7f81c52bf726c19b575ff28..d9c236e83696bd455bf2182dd7b5177cd3f1bcdd 100644 (file)
@@ -205,13 +205,15 @@ BuildRequires:  librabbitmq-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: libtool-ltdl-devel
 BuildRequires: python%{_python_buildid}-cherrypy
 BuildRequires: python%{_python_buildid}-jwt