install-deps.sh,deb,rpm: move python-saml deps into debian/control and ceph.spec.in

these dependencies are only used for building python-saml which is in
turn used for the SAML support. this feature is tested using
`test_sso.py` while performing dashboard tests. we do not package or
ship python-saml along with other Ceph packages. so let's move these
dependencies to the "make check" sections in ceph.spec.in and
debian/control for simplifying install-deps.sh.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 251e9ddd5237603c7fd2ac8433569e21041f17da..119788f12742d49a503f9b87c5a2458275a7eca9 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -277,19 +277,28 @@ BuildRequires:    lz4-devel >= 1.7
 # distro-conditional make check dependencies
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
+BuildRequires: libtool-ltdl-devel
 BuildRequires: python%{_python_buildid}-cherrypy
 BuildRequires: python%{_python_buildid}-jwt
 BuildRequires: python%{_python_buildid}-routes
 BuildRequires: python%{_python_buildid}-werkzeug
-BuildRequires:  xmlsec1
+BuildRequires: xmlsec1
+BuildRequires: xmlsec1-devel
+BuildRequires: xmlsec1-nss
+BuildRequires: xmlsec1-openssl
+BuildRequires: xmlsec1-openssl-devel
 %endif
 %if 0%{?suse_version}
+BuildRequires: libxmlsec1-1
+BuildRequires: libxmlsec1-nss1
+BuildRequires: libxmlsec1-openssl1
 BuildRequires: python%{_python_buildid}-CherryPy
 BuildRequires: python%{_python_buildid}-PyJWT
 BuildRequires: python%{_python_buildid}-Routes
 BuildRequires: python%{_python_buildid}-Werkzeug
 BuildRequires: python%{_python_buildid}-numpy-devel
-BuildRequires:  xmlsec1-devel
+BuildRequires: xmlsec1-devel
+BuildRequires: xmlsec1-openssl-devel
 %endif
 %endif
 # lttng and babeltrace for rbd-replay-prep

diff --git a/debian/control b/debian/control
index 374564fe3f3dba7611df2963525afcf270784c21..93213464c123f6788b0467b36c3e24f607189c82 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,10 @@ Build-Depends: cmake (>= 3.5),
                libxml2-dev,
 # Crimson      libyaml-cpp-dev,
                librabbitmq-dev,
+# Make-Check   libxmlsec1
+# Make-Check   libxmlsec1-nss
+# Make-Check   libxmlsec1-openssl
+# Make-Check   libxmlsec1-dev
                lsb-release,
                parted,
                patch,

diff --git a/install-deps.sh b/install-deps.sh
index f116c213b64c9e8ddda1e601dcc2ecfe64faaf21..0df7fdd80c38120e3b95e6d2ae07cdad53b40242 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -342,7 +342,6 @@ else
        $SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool="apt-get -y --no-install-recommends $backports" $control || exit 1
        $SUDO env DEBIAN_FRONTEND=noninteractive apt-get -y remove ceph-build-deps
        if [ "$control" != "debian/control" ] ; then rm $control; fi
-       $SUDO apt-get install -y libxmlsec1 libxmlsec1-nss libxmlsec1-openssl libxmlsec1-dev
         ;;
     centos|fedora|rhel|ol|virtuozzo)
         yumdnf="yum"
@@ -403,8 +402,6 @@ else
        fi
         IGNORE_YUM_BUILDEP_ERRORS="ValueError: SELinux policy is not managed or store cannot be accessed."
         sed "/$IGNORE_YUM_BUILDEP_ERRORS/d" $DIR/yum-builddep.out | grep -qi "error:" && exit 1
-        # for building python-saml and its dependencies
-        $SUDO $yumdnf install -y xmlsec1 xmlsec1-nss xmlsec1-openssl xmlsec1-devel xmlsec1-openssl-devel libtool-ltdl-devel
         ;;
     opensuse*|suse|sles)
         echo "Using zypper to install dependencies"
@@ -412,7 +409,6 @@ else
         $SUDO $zypp_install systemd-rpm-macros
         munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
-        $SUDO $zypp_install libxmlsec1-1 libxmlsec1-nss1 libxmlsec1-openssl1 xmlsec1-devel xmlsec1-openssl-devel
         ;;
     alpine)
         # for now we need the testing repo for leveldb