From c95d1cc4385c3be1edb97565ae6f64adde2dbfc6 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 24 Feb 2021 15:13:40 -0500 Subject: [PATCH] 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 --- ceph-dev-build/build/build_rpm | 2 +- .../config/definitions/ceph-dev-cron.yml | 40 ---------------- ceph-dev-new-build/build/build_rpm | 2 +- ceph-dev-new-setup/build/build | 5 -- .../definitions/ceph-dev-new-trigger.yml | 48 ------------------- .../config/definitions/ceph-dev-new.yml | 3 +- ceph-dev-setup/build/build | 5 -- .../config/definitions/ceph-dev-trigger.yml | 28 ----------- ceph-dev/config/definitions/ceph-dev.yml | 3 +- ceph-setup/build/build | 13 +---- 10 files changed, 6 insertions(+), 143 deletions(-) diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 73f42d66..05b67db6 100644 --- 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 6ea3df23..6f7c597d 100644 --- 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 da67dca9..37751068 100644 --- 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 a3040aa9..a25f471c 100644 --- 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 e25041e6..73fb5398 100644 --- 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 4a769d70..1e9d9924 100644 --- 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 dd601924..9b04314f 100644 --- 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 4b17a043..2ab29e26 100644 --- 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 03eed52e..a15945ee 100644 --- 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 1e90b075..7e581450 100644 --- 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` -- 2.39.5