Skip to content

Commit 7bf4390

Browse files
committed
ceph-dev-new-setup/build: cleanup *-debug branches
the newly introduced "debug" flavor from #2497 can be used insead. Signed-off-by: Matan Breizman <mbreizma@redhat.com>
1 parent b7141eb commit 7bf4390

File tree

1 file changed

+0
-22
lines changed
  • ceph-dev-new-setup/build

1 file changed

+0
-22
lines changed

ceph-dev-new-setup/build/build

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,6 @@ else
6464
echo "forcing."
6565
fi
6666

67-
# This is a dev release, enable some debug cmake configs. Note: it has been
68-
# this way since at least 35e1a715. It's difficult to tell when or even if ceph
69-
# was ever properly built with debugging configurations for QA as there are
70-
# corresponding changes in ceph with the switch to cmake which makes this
71-
# challenging to evaluate.
72-
#
73-
# It's likely that it was wrongly assumed that cmake would set the build type
74-
# to Debug because the ".git" directory would be present. This is not the case
75-
# because the "make-dist" script (executed below) creates a git tarball that is
76-
# used for the actual untar/build. See also:
77-
#
78-
# https://github.com/ceph/ceph/pull/53800
79-
#
80-
# Addendum and possibly temporary restriction: only enable these for branches
81-
# ending in "-debug".
82-
if [[ "$BRANCH" == *-debug ]]; then
83-
CEPH_EXTRA_CMAKE_ARGS+=" -DCMAKE_BUILD_TYPE=Debug -DWITH_CEPH_DEBUG_MUTEX=ON"
84-
printf 'Added debug cmake configs to branch %s. CEPH_EXTRA_CMAKE_ARGS: %s\n' "$BRANCH" "$CEPH_EXTRA_CMAKE_ARGS"
85-
else
86-
printf 'No cmake debug options added to branch %s.\n' "$BRANCH"
87-
fi
88-
8967
# Tentacle is the last release that needs dedicated Crimson builds,
9068
# Later releases are able to use Crimson with the default build.
9169
# As the "Crimson flavor" is no longer available, we need a *temporary* way

0 commit comments

Comments
 (0)