Disable notcmalloc builds!

We no longer need notmcalloc packages.  Valgrind works now.

See https://github.com/ceph/ceph/pull/39561

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 73f42d6633cba4d04429fbc2616990717657f0be..05b67db60929ba0d930ac06994852c9733369c0e 100644 (file)
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -76,7 +76,7 @@ fi
 
 # XXX perhaps use job parameters instead of literals; then
 # later stages can also use them to compare etc.
-if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $FLAVOR != "notcmalloc" ]] ; then
+if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" ]] ; then
     loop=0
     ready=false
     while ((loop < 15)); do

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index 6ea3df23a5389f2674d3c8d6b7326cd2b749026d..6f7c597ded5d76bd06bcaf9e49ef8fee8a558125 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -40,7 +40,6 @@
     builders:
       # Build luminous on:
       # default: centos7 bionic xenial trusty
-      # notcmalloc: centos7
       - conditional-step:
           condition-kind: regex-match
           regex: .*luminous.*
@@ -57,16 +56,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=centos7 bionic xenial trusty
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    FLAVOR=notcmalloc
-                    DISTROS=centos7
-                    ARCHS=x86_64
       # build nautilus on:
       # default: bionic xenial centos7 centos8
-      # notcmalloc: centos7
       - conditional-step:
           condition-kind: regex-match
           regex: .*nautilus.*
@@ -83,16 +74,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=bionic xenial centos7 centos8
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos7
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
       # build octopus on:
       # default: focal bionic centos7 centos8 leap15
-      # notcmalloc: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*octopus.*
@@ -109,16 +92,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos7 centos8 leap15
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
       # build pacific on:
       # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -136,13 +111,6 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos8 leap15
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
@@ -152,7 +120,6 @@
                     ARCHS=x86_64
       # build master on:
       # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -170,13 +137,6 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos8
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}

diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index da67dca9d83f7f6ff09725ea5493b3e4a6756560..37751068f80d78829fc9a08384d3b5ed1fdae151 100644 (file)
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -78,7 +78,7 @@ fi
 # XXX perhaps use job parameters instead of literals; then
 # later stages can also use them to compare etc.
 # build container image that supports building crimson-osd
-if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && $FLAVOR != "notcmalloc" ]] ; then
+if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" ]] ; then
     loop=0
     ready=false
     while ((loop < 15)); do

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index a3040aa9b4f3e2774df3f08f283e86adf3d4bcba..a25f471c6010c16bf9882e27811475b3c3afeec6 100644 (file)
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -67,11 +67,6 @@ fi
 # Flavor Builds support
 
 case "${FLAVOR}" in
-    notcmalloc)
-        echo "Detected notcmalloc flavor: will use flag: -DALLOCATOR=libc"
-        CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_CEPH_DEBUG_MUTEX=ON -DWITH_BOOST_VALGRIND=ON"
-        ;;
     default)
         CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
         CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"

diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index e25041e6bd4d3a0769d1e08fc0da021754432744..73fb53982f3971c5b3a1e8c0bc36b8d9020f56b1 100644 (file)
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -30,7 +30,6 @@
     builders:
       # Build luminous on:
       # default: centos7 bionic xenial trusty
-      # notcmalloc: centos7
       - conditional-step:
           condition-kind: regex-match
           regex: .*luminous.*
@@ -47,16 +46,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=centos7 bionic xenial trusty
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    FLAVOR=notcmalloc
-                    DISTROS=centos7
-                    ARCHS=x86_64
       # build mimic on:
       # default: bionic xenial centos7
-      # notcmalloc: centos7
       - conditional-step:
           condition-kind: regex-match
           regex: .*mimic.*
@@ -73,16 +64,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=bionic xenial centos7
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos7
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
       # build nautilus on:
       # default: bionic xenial centos7 centos8
-      # notcmalloc: centos7
       - conditional-step:
           condition-kind: regex-match
           regex: .*nautilus.*
@@ -99,16 +82,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=bionic xenial centos7 centos8
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos7
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
       # build octopus on:
       # default: focal bionic centos7 centos8 leap15
-      # notcmalloc: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*octopus.*
@@ -125,16 +100,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos7 centos8 leap15
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
       # build pacific on:
       # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -152,13 +119,6 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos8
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
@@ -184,14 +144,6 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos8
-            - trigger-builds:
-                - project: 'ceph-dev-new'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                    ARCHS=x86_64
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |

diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index 4a769d70de687ef1c0a37448969a36d0d59de328..1e9d99241822a1997e5301d35f8488766a69d54a 100644 (file)
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -55,10 +55,9 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           name: FLAVOR
           choices:
             - default
-            - notcmalloc
             - crimson
           default: "default"
-          description: "Type of Ceph build, choices are: crimson, notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'"
+          description: "Type of Ceph build, choices are: crimson, default. Defaults to: 'default'"
 
       - string:
           name: CI_CONTAINER

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index dd601924db36ee2a8425d3bdc5f1811ee63b0457..9b04314f2c79aa7716dec2c6d396721684c3939f 100644 (file)
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -39,11 +39,6 @@ git submodule update --init
 # Flavor Builds support
 
 case "${FLAVOR}" in
-    notcmalloc)
-        echo "Detected notcmalloc flavor: will use flag: -DALLOCATOR=libc"
-        CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
-        CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_CEPH_DEBUG_MUTEX=ON -DWITH_BOOST_VALGRIND=ON"
-        ;;
     default)
         CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
         CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"

diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 4b17a04311210a92210fcbbeff312b4f09098151..2ab29e26e48426b4343a62f489bca8007b52ed75 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -41,7 +41,6 @@
     builders:
       # build nautilus on:
       # default: bionic xenial centos7 centos8
-      # notcmalloc: centos7
       - conditional-step:
           condition-kind: regex-match
           regex: .*nautilus.*
@@ -58,15 +57,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=bionic xenial centos7 centos8
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos7
-                    FLAVOR=notcmalloc
       # build octopus on:
       # default: focal bionic centos7 centos8 leap15
-      # notcmalloc: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*octopus.*
@@ -83,15 +75,8 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos7 centos8 leap15
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
       # build pacific on:
       # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -109,12 +94,6 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos8 leap15
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
@@ -123,7 +102,6 @@
                     FLAVOR=crimson
       # build master on:
       # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -141,12 +119,6 @@
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
                     DISTROS=focal bionic centos8
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 03eed52e9e076462b14c9f5cc4e624fa7717dfd6..a15945eebcd3c210dce6794662662a0dd3e7a842 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -55,10 +55,9 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           name: FLAVOR
           choices:
             - default
-            - notcmalloc
             - crimson
           default: "default"
-          description: "Type of Ceph build, choices are: crimson, notcmalloc, default (i.e. with tcmalloc). Defaults to: 'default'"
+          description: "Type of Ceph build, choices are: crimson, default. Defaults to: 'default'"
 
       - bool:
           name: CI_CONTAINER

diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 1e90b0751c6be410922b35b57d077134e0642fa7..7e581450fd23f0a5bb8e87742e33065ff356cbc3 100644 (file)
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -31,17 +31,8 @@ rm -rf release
 echo "Running submodule update ..."
 git submodule update --init
 
-# Flavor Builds support
-
-if [ "${FLAVOR}" == "notcmalloc" ]
-then
-    echo "Detected notcmalloc flavor: will use flag: -DALLOCATOR=libc"
-    CEPH_EXTRA_RPMBUILD_ARGS="--without tcmalloc"
-    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc -DWITH_BOOST_VALGRIND=ON"
-else
-    CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
-    CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
-fi
+CEPH_EXTRA_RPMBUILD_ARGS="--with tcmalloc"
+CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc"
 
 
 # When using autotools/autoconf it is possible to see output from `git diff`