From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Jun 2016 12:55:56 +0000 (-0400)
Subject: remove build-ceph-{gcov,notcmalloc}
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5dd6276ad62db34a7c72bd22c2582a21031c2c54;p=autobuild-ceph.git

remove build-ceph-{gcov,notcmalloc}

build-auto does this via the normal path via environment variables.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh
deleted file mode 100755
index 31ccf8a..0000000
--- a/build-ceph-gcov.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh -x
-set -e
-
-
-git submodule foreach 'git clean -fdx && git reset --hard'
-rm -rf ceph-object-corpus
-rm -rf ceph-erasure-code-corpus
-rm -rf src/gmock
-rm -rf src/leveldb
-rm -rf src/libs3
-rm -rf src/mongoose
-rm -rf src/civetweb
-rm -rf src/rocksdb
-rm -rf src/erasure-code/jerasure/gf-complete
-rm -rf src/erasure-code/jerasure/jerasure
-rm -rf .git/modules/
-git clean -fdx && git reset --hard
-/srv/git/bin/git submodule sync
-/srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init
-git clean -fdx
-
-echo --START-IGNORE-WARNINGS
-[ ! -x install-deps.sh ] || ./install-deps.sh
-[ ! -x autogen.sh ] || ./autogen.sh || exit 1
-autoconf || true
-echo --STOP-IGNORE-WARNINGS
-[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --enable-coverage"
-[ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java $CEPH_EXTRA_CONFIGURE_ARGS || exit 2
-
-if [ ! -e Makefile ]; then
-    echo "$0: no Makefile, aborting." 1>&2
-    exit 3
-fi
-
-# Actually build the project
-
-# clear out any $@ potentially passed in
-set --
-
-# enable ccache if it is installed
-export CCACHE_DIR="$PWD/../../ccache"
-if command -v ccache >/dev/null; then
-  if [ ! -e "$CCACHE_DIR" ]; then
-    echo "$0: have ccache but cache directory does not exist: $CCACHE_DIR" 1>&2
-  else
-    set -- CC='ccache gcc' CXX='ccache g++'
-  fi
-else
-  echo "$0: no ccache found, compiles will be slower." 1>&2
-fi
-
-NCPU=$(( 2 * `grep -c processor /proc/cpuinfo` ))
-ionice -c3 nice -n20 make -j$NCPU "$@" || exit 4
-
-# The "make -q check" probe in build.sh.example is faulty in that
-# screwups in Makefiles make it think there are no unit tests to
-# run. That's unacceptable; use a dumber probe.
-if [ -e src/gtest ]; then
-    # run "make check", but give it a time limit in case a test gets stuck
-    ../maxtime 1800 ionice -c3 nice -n20 make check "$@" || exit 5
-fi
-
-REV="$(git rev-parse HEAD)"
-OUTDIR="../out/output/sha1/$REV"
-OUTDIR_TMP="${OUTDIR}.tmp"
-install -d -m0755 -- "$OUTDIR_TMP"
-printf '%s\n' "$REV" >"$OUTDIR_TMP/sha1"
-MACH="$(uname -m)"
-INSTDIR="inst.tmp"
-[ ! -e "$INSTDIR" ]
-../maxtime 1800 ionice -c3 nice -n20 make install DESTDIR="$PWD/$INSTDIR"
-tar czf "$OUTDIR_TMP/ceph.$MACH.tgz" -C "$INSTDIR" .
-rm -rf -- "$INSTDIR"
-
-# put our temp files inside .git/ so ls-files doesn't see them
-git ls-files --modified >.git/modified-files
-if [ -s .git/modified-files ]; then
-    rm -rf "$OUTDIR_TMP"
-    echo "error: Modified files:" 1>&2
-    cat .git/modified-files 1>&2
-    exit 6
-fi
-
-git ls-files --exclude-standard --others >.git/added-files
-if [ -s .git/added-files ]; then
-    rm -rf "$OUTDIR_TMP"
-    echo "error: Added files:" 1>&2
-    cat .git/added-files 1>&2
-    exit 7
-fi
-
-# we're successful, the files are ok to be published; try to be as
-# atomic as possible about replacing potentially existing OUTDIR
-if [ -e "$OUTDIR" ]; then
-    rm -rf -- "$OUTDIR.old"
-    mv -- "$OUTDIR" "$OUTDIR.old"
-fi
-mv -- "$OUTDIR_TMP" "$OUTDIR"
-rm -rf -- "$OUTDIR.old"
-
-exit 0
diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh
deleted file mode 100755
index 049720e..0000000
--- a/build-ceph-notcmalloc.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh -x
-set -e
-
-
-git submodule foreach 'git clean -fdx && git reset --hard'
-rm -rf ceph-object-corpus
-rm -rf ceph-erasure-code-corpus
-rm -rf src/gmock
-rm -rf src/leveldb
-rm -rf src/libs3
-rm -rf src/mongoose
-rm -rf src/civetweb
-rm -rf src/rocksdb
-rm -rf src/erasure-code/jerasure/gf-complete
-rm -rf src/erasure-code/jerasure/jerasure
-rm -rf .git/modules/
-git clean -fdx && git reset --hard
-/srv/git/bin/git submodule sync
-/srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init
-git clean -fdx
-
-
-echo --START-IGNORE-WARNINGS
-[ ! -x install-deps.sh ] || ./install-deps.sh
-[ ! -x autogen.sh ] || ./autogen.sh || exit 1
-autoconf || true
-echo --STOP-IGNORE-WARNINGS
-[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--without-tcmalloc
-[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-profiler $CEPH_EXTRA_CONFIGURE_ARGS || exit 2
-
-if [ ! -e Makefile ]; then
-    echo "$0: no Makefile, aborting." 1>&2
-    exit 3
-fi
-
-# Actually build the project
-
-# clear out any $@ potentially passed in
-set --
-
-# enable ccache if it is installed
-export CCACHE_DIR="$PWD/../../ccache"
-if command -v ccache >/dev/null; then
-  if [ ! -e "$CCACHE_DIR" ]; then
-    echo "$0: have ccache but cache directory does not exist: $CCACHE_DIR" 1>&2
-  else
-    set -- CC='ccache gcc' CXX='ccache g++'
-  fi
-else
-  echo "$0: no ccache found, compiles will be slower." 1>&2
-fi
-
-NCPU=$(( 2 * `grep -c processor /proc/cpuinfo` ))
-ionice -c3 nice -n20 make -j$NCPU "$@" || exit 4
-
-# The "make -q check" probe in build.sh.example is faulty in that
-# screwups in Makefiles make it think there are no unit tests to
-# run. That's unacceptable; use a dumber probe.
-if [ -e src/gtest ]; then
-    # run "make check", but give it a time limit in case a test gets stuck
-    ../maxtime 1800 ionice -c3 nice -n20 make check "$@" || exit 5
-fi
-
-REV="$(git rev-parse HEAD)"
-OUTDIR="../out/output/sha1/$REV"
-OUTDIR_TMP="${OUTDIR}.tmp"
-install -d -m0755 -- "$OUTDIR_TMP"
-printf '%s\n' "$REV" >"$OUTDIR_TMP/sha1"
-MACH="$(uname -m)"
-INSTDIR="inst.tmp"
-[ ! -e "$INSTDIR" ]
-../maxtime 1800 ionice -c3 nice -n20 make install DESTDIR="$PWD/$INSTDIR"
-tar czf "$OUTDIR_TMP/ceph.$MACH.tgz" -C "$INSTDIR" .
-rm -rf -- "$INSTDIR"
-
-# put our temp files inside .git/ so ls-files doesn't see them
-git ls-files --modified >.git/modified-files
-if [ -s .git/modified-files ]; then
-    rm -rf "$OUTDIR_TMP"
-    echo "error: Modified files:" 1>&2
-    cat .git/modified-files 1>&2
-    exit 6
-fi
-
-git ls-files --exclude-standard --others >.git/added-files
-if [ -s .git/added-files ]; then
-    rm -rf "$OUTDIR_TMP"
-    echo "error: Added files:" 1>&2
-    cat .git/added-files 1>&2
-    exit 7
-fi
-
-# we're successful, the files are ok to be published; try to be as
-# atomic as possible about replacing potentially existing OUTDIR
-if [ -e "$OUTDIR" ]; then
-    rm -rf -- "$OUTDIR.old"
-    mv -- "$OUTDIR" "$OUTDIR.old"
-fi
-mv -- "$OUTDIR_TMP" "$OUTDIR"
-rm -rf -- "$OUTDIR.old"
-
-exit 0