ceph-dev*: final transition to WITH_CRIMSON

Follow up to: https://github.com/ceph/ceph-build/pull/2329
Now that https://github.com/ceph/ceph/pull/62325 is merged.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
index 8e5dd2fb3e71f88c2d7de981f868d6ba6338cb6e..d930bdff7cd6cc7ef756fe602f9011705302643d 100644 (file)
--- a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
+++ b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
@@ -69,7 +69,7 @@
               export WITH_SEASTAR=true
               # TODO use clang-10 on ubuntu/focal
               timeout 7200 src/script/run-make.sh \
-                --cmake-args "-DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler -DCMAKE_BUILD_TYPE=Release -DWITH_SEASTAR=ON -DWITH_CRIMSON=ON -DWITH_TESTS=OFF" \
+                --cmake-args "-DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler -DCMAKE_BUILD_TYPE=Release -DWITH_CRIMSON=ON -DWITH_TESTS=OFF" \
                 vstart-base crimson-osd
               src/script/run-cbt.sh --build-dir $PWD/build --source-dir $PWD --cbt ${{WORKSPACE}}/cbt -a $archive_dir src/test/crimson/cbt/radosbench_4K_read.yaml
           else

diff --git a/ceph-pull-requests-arm64/build/build b/ceph-pull-requests-arm64/build/build
index 3345203c4b8852a275321cff676bd88c55f30f19..8b4c1372a9199193b2c07309348a7f1ca20e58df 100644 (file)
--- a/ceph-pull-requests-arm64/build/build
+++ b/ceph-pull-requests-arm64/build/build
@@ -11,7 +11,6 @@ n_build_jobs=$(get_nr_build_jobs)
 n_test_jobs=${n_build_jobs}
 export CHECK_MAKEOPTS="-j${n_test_jobs}"
 export BUILD_MAKEOPTS="-j${n_build_jobs}"
-export WITH_SEASTAR=true
 export WITH_CRIMSON=true
 export WITH_RBD_RWL=true
 timeout 4h ./run-make-check.sh

diff --git a/ceph-pull-requests/build/build b/ceph-pull-requests/build/build
index c3a172ecb2522eb1dc717874656efd67b18a2d6b..351b2b7f33d636059d4886e8bd6203c8e99db6bb 100644 (file)
--- a/ceph-pull-requests/build/build
+++ b/ceph-pull-requests/build/build
@@ -8,7 +8,6 @@ if [[ "$DOCS_ONLY" = true || "$CONTAINER_ONLY" = true ]]; then
 fi
 
 export NPROC=$(nproc)
-export WITH_SEASTAR=true
 export WITH_CRIMSON=true
 export WITH_RBD_RWL=true
 timeout 3h ./run-make-check.sh

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index ba6756ad4db093ea0bb4511949bef0c323ded213..6b86f4ab07f6e5d125fedb7175a4f4b5e743fb50 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -876,8 +876,7 @@ ceph_build_args_from_flavor() {
         DEB_BUILD_PROFILES=""
         ;;
     crimson)
-        CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
-        CEPH_EXTRA_RPMBUILD_ARGS="${CEPH_EXTRA_RPMBUILD_ARGS} --with crimson"
+        CEPH_EXTRA_RPMBUILD_ARGS="--with crimson"
         CEPH_EXTRA_CMAKE_ARGS+=" -DCMAKE_BUILD_TYPE=Debug"
         DEB_BUILD_PROFILES="pkg.ceph.crimson"
         ;;
@@ -1493,7 +1492,6 @@ setup_rpm_build_deps() {
     # enable more build depends required by build flavor(jaeger, crimson)
     case "${FLAVOR}" in
     crimson)
-      sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $DIR/ceph.spec
       sed -i -e 's/%bcond_with crimson/%bcond_without crimson/g' $DIR/ceph.spec
         ;;
     jaeger)