From: Kefu Chai <kchai@redhat.com>
Date: Mon, 19 Aug 2019 07:21:06 +0000 (+0800)
Subject: cmake,run-make-check.sh,deb,rpm: disable SPDK by default
X-Git-Tag: v15.1.0~1836^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3234fb3982483d43a23df902628178566128b7b4;p=ceph-ci.git

cmake,run-make-check.sh,deb,rpm: disable SPDK by default

but we still enable it in `run-make-check.sh`

* cmake: disable SPDK by default
* run-make-check.sh: enable WITH_SPDK so at least we can ensure it
  builds
* deb,rpm: add uuid-dev / libuuid-devel as a "make check" dependency

Fixes: https://tracker.ceph.com/issues/41330
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc15544bc18..92acfd2f2a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,7 +283,7 @@ if(WITH_BLUESTORE_PMEM)
   set(HAVE_BLUESTORE_PMEM ON)
 endif()
 
-CMAKE_DEPENDENT_OPTION(WITH_SPDK "Enable SPDK" ON
+CMAKE_DEPENDENT_OPTION(WITH_SPDK "Enable SPDK" OFF
   "CMAKE_SYSTEM_PROCESSOR MATCHES i386|i686|amd64|x86_64|AMD64|aarch64" OFF)
 if(WITH_SPDK)
   if(NOT WITH_BLUESTORE)
diff --git a/ceph.spec.in b/ceph.spec.in
index baf5ba02016..251e9ddd523 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -173,7 +173,6 @@ BuildRequires:	libnl3-devel
 BuildRequires:	liboath-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
-BuildRequires:	libuuid-devel
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 BuildRequires:	parted
@@ -198,6 +197,7 @@ BuildRequires:  librabbitmq-devel
 %endif
 %if 0%{with make_check}
 BuildRequires:  jq
+BuildRequires:	libuuid-devel
 BuildRequires:	python%{_python_buildid}-bcrypt
 BuildRequires:	python%{_python_buildid}-coverage
 BuildRequires:	python%{_python_buildid}-nose
diff --git a/debian/control b/debian/control
index a9a35b2cd72..374564fe3f3 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Build-Depends: cmake (>= 3.5),
 # Crimson      ragel,
 # Make-Check   socat,
 # Crimson      systemtap-sdt-dev,
-               uuid-dev,
+# Make-Check   uuid-dev,
                uuid-runtime,
                valgrind,
                virtualenv | python-virtualenv,
diff --git a/run-make-check.sh b/run-make-check.sh
index cc5ff9fefb2..32d88e28332 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -111,7 +111,7 @@ function run() {
     BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
     test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
     CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
-    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DWITH_CEPHFS_SHELL=ON"
+    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DWITH_CEPHFS_SHELL=ON -DWITH_SPDK=ON"
     CMAKE_BUILD_OPTS+=$(detect_ceph_dev_pkgs)
     cat <<EOM
 Note that the binaries produced by this script do not contain correct time