run-make-check.sh: extract run-make.sh

so we can reuse run-make.sh for building the artifact used by other
tests than "make check", for instance, dashboard's E2E test and
crimson's performance test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5e9a1d95c9f735955b92204df1f711d5098e2b2d)

Conflicts:
	run-make-check.sh
        - Remove flags: -DWITH_CEPHFS_SHELL=ON -DWITH_SPDK=ON
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

diff --git a/run-make-check.sh b/run-make-check.sh
index 1fa2c50a8eba1f614c983082651b60a74bd40b90..94e37c49e96174548b5ac447d85d89ea665dd93b 100755 (executable)
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -18,129 +18,9 @@
 # $ DRY_RUN=echo ./run-make-check.sh
 #
 
-set -e
-
-trap clean_up_after_myself EXIT
-
-ORIGINAL_CCACHE_CONF="$HOME/.ccache/ccache.conf"
-SAVED_CCACHE_CONF="$HOME/.run-make-check-saved-ccache-conf"
-
-function save_ccache_conf() {
-    test -f $ORIGINAL_CCACHE_CONF && cp $ORIGINAL_CCACHE_CONF $SAVED_CCACHE_CONF || true
-}
-
-function restore_ccache_conf() {
-    test -f $SAVED_CCACHE_CONF && mv $SAVED_CCACHE_CONF $ORIGINAL_CCACHE_CONF || true
-}
-
-function clean_up_after_myself() {
-    rm -fr ${CEPH_BUILD_VIRTUALENV:-/tmp}/*virtualenv*
-    restore_ccache_conf
-}
-
-function get_processors() {
-    if test -n "$NPROC" ; then
-        echo $NPROC
-    else
-        if test $(nproc) -ge 2 ; then
-            expr $(nproc) / 2
-        else
-            echo 1
-        fi
-    fi
-}
-
-function detect_ceph_dev_pkgs() {
-    local cmake_opts
-    local boost_root=/opt/ceph
-    if test -f $boost_root/include/boost/config.hpp; then
-        cmake_opts+=" -DWITH_SYSTEM_BOOST=ON -DBOOST_ROOT=$boost_root"
-    else
-        cmake_opts+=" -DBOOST_J=$(get_processors)"
-    fi
-    echo "$cmake_opts"
-}
+source src/script/run-make.sh
 
 function run() {
-    local install_cmd
-    local which_pkg="which"
-    source /etc/os-release
-    if test -f /etc/redhat-release ; then
-        if ! type bc > /dev/null 2>&1 ; then
-            echo "Please install bc and re-run." 
-            exit 1
-        fi
-        if test "$(echo "$VERSION_ID >= 22" | bc)" -ne 0; then
-            install_cmd="dnf -y install"
-        else
-            install_cmd="yum install -y"
-        fi
-    elif type zypper > /dev/null 2>&1 ; then
-        install_cmd="zypper --gpg-auto-import-keys --non-interactive install --no-recommends"
-    elif type apt-get > /dev/null 2>&1 ; then
-        install_cmd="apt-get install -y"
-        which_pkg="debianutils"
-    fi
-
-    if ! type sudo > /dev/null 2>&1 ; then
-        echo "Please install sudo and re-run. This script assumes it is running"
-        echo "as a normal user with the ability to run commands as root via sudo." 
-        exit 1
-    fi
-    if [ -n "$install_cmd" ]; then
-        $DRY_RUN sudo $install_cmd ccache $which_pkg
-    else
-        echo "WARNING: Don't know how to install packages" >&2
-        echo "This probably means distribution $ID is not supported by run-make-check.sh" >&2
-    fi
-
-    if ! type ccache > /dev/null 2>&1 ; then
-        echo "ERROR: ccache could not be installed"
-        exit 1
-    fi
-
-    if test -f ./install-deps.sh ; then
-           export WITH_SEASTAR=1
-           export FOR_MAKE_CHECK=1
-           $DRY_RUN source ./install-deps.sh || return 1
-        trap clean_up_after_myself EXIT
-    fi
-
-    # Init defaults after deps are installed. get_processors() depends on coreutils nproc.
-    DEFAULT_MAKEOPTS=${DEFAULT_MAKEOPTS:--j$(get_processors)}
-    BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
-    test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
-    CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
-    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON"
-    CMAKE_BUILD_OPTS+=$(detect_ceph_dev_pkgs)
-    cat <<EOM
-Note that the binaries produced by this script do not contain correct time
-and git version information, which may make them unsuitable for debugging
-and production use.
-EOM
-    save_ccache_conf
-    # remove the entropy generated by the date/time embedded in the build
-    CMAKE_BUILD_OPTS+=" -DENABLE_GIT_VERSION=OFF"
-    $DRY_RUN export SOURCE_DATE_EPOCH="946684800"
-    $DRY_RUN ccache -o sloppiness=time_macros
-    $DRY_RUN ccache -o run_second_cpp=true
-    if [ -n "$JENKINS_HOME" ]; then
-        # Build host has plenty of space available, let's use it to keep
-        # various versions of the built objects. This could increase the cache hit
-        # if the same or similar PRs are running several times
-        $DRY_RUN ccache -o max_size=100G
-    else
-        echo "Current ccache max_size setting:"
-        ccache -p | grep max_size
-    fi
-    $DRY_RUN ccache -sz # Reset the ccache statistics and show the current configuration
-
-    $DRY_RUN ./do_cmake.sh $CMAKE_BUILD_OPTS $@ || return 1
-    $DRY_RUN cd build
-    $DRY_RUN make $BUILD_MAKEOPTS tests || return 1
-
-    $DRY_RUN ccache -s # print the ccache statistics to evaluate the efficiency
-
     # to prevent OSD EMFILE death on tests, make sure ulimit >= 1024
     $DRY_RUN ulimit -n $(ulimit -Hn)
     if [ $(ulimit -n) -lt 1024 ];then
@@ -152,6 +32,7 @@ EOM
     # limit while running seastar tests and bluestore tests.
     $DRY_RUN sudo /sbin/sysctl -q -w fs.aio-max-nr=$((65536 * 16))
 
+    CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
     if ! $DRY_RUN ctest $CHECK_MAKEOPTS --output-on-failure; then
         rm -fr ${TMPDIR:-/tmp}/ceph-asok.*
         return 1
@@ -171,7 +52,11 @@ function main() {
         echo "Please fix 'hostname --fqdn', otherwise 'make check' will fail"
         return 1
     fi
-    run "$@" && echo "make check: successful run on $(git rev-parse HEAD)"
+    FOR_MAKE_CHECK=1 prepare
+    # Init defaults after deps are installed.
+    configure "-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DENABLE_GIT_VERSION=OFF $@"
+    build tests && echo "make check: successful run on $(git rev-parse HEAD)"
+    run
 }
 
 main "$@"

diff --git a/src/script/run-make.sh b/src/script/run-make.sh
new file mode 100755 (executable)
index 0000000..d5c2e08
--- /dev/null
+++ b/src/script/run-make.sh
@@ -0,0 +1,159 @@
+#!/usr/bin/env bash
+
+set -e
+
+trap clean_up_after_myself EXIT
+
+ORIGINAL_CCACHE_CONF="$HOME/.ccache/ccache.conf"
+SAVED_CCACHE_CONF="$HOME/.run-make-check-saved-ccache-conf"
+
+function save_ccache_conf() {
+    test -f $ORIGINAL_CCACHE_CONF && cp $ORIGINAL_CCACHE_CONF $SAVED_CCACHE_CONF || true
+}
+
+function restore_ccache_conf() {
+    test -f $SAVED_CCACHE_CONF && mv $SAVED_CCACHE_CONF $ORIGINAL_CCACHE_CONF || true
+}
+
+function clean_up_after_myself() {
+    rm -fr ${CEPH_BUILD_VIRTUALENV:-/tmp}/*virtualenv*
+    restore_ccache_conf
+}
+
+function get_processors() {
+    # get_processors() depends on coreutils nproc.
+    if test -n "$NPROC" ; then
+        echo $NPROC
+    else
+        if test $(nproc) -ge 2 ; then
+            expr $(nproc) / 2
+        else
+            echo 1
+        fi
+    fi
+}
+
+function detect_ceph_dev_pkgs() {
+    local cmake_opts
+    local boost_root=/opt/ceph
+    if test -f $boost_root/include/boost/config.hpp; then
+        cmake_opts+=" -DWITH_SYSTEM_BOOST=ON -DBOOST_ROOT=$boost_root"
+    else
+        cmake_opts+=" -DBOOST_J=$(get_processors)"
+    fi
+    echo "$cmake_opts"
+}
+
+function prepare() {
+    local install_cmd
+    local which_pkg="which"
+    source /etc/os-release
+    if test -f /etc/redhat-release ; then
+        if ! type bc > /dev/null 2>&1 ; then
+            echo "Please install bc and re-run." 
+            exit 1
+        fi
+        if test "$(echo "$VERSION_ID >= 22" | bc)" -ne 0; then
+            install_cmd="dnf -y install"
+        else
+            install_cmd="yum install -y"
+        fi
+    elif type zypper > /dev/null 2>&1 ; then
+        install_cmd="zypper --gpg-auto-import-keys --non-interactive install --no-recommends"
+    elif type apt-get > /dev/null 2>&1 ; then
+        install_cmd="apt-get install -y"
+        which_pkg="debianutils"
+    fi
+
+    if ! type sudo > /dev/null 2>&1 ; then
+        echo "Please install sudo and re-run. This script assumes it is running"
+        echo "as a normal user with the ability to run commands as root via sudo." 
+        exit 1
+    fi
+    if [ -n "$install_cmd" ]; then
+        $DRY_RUN sudo $install_cmd ccache $which_pkg
+    else
+        echo "WARNING: Don't know how to install packages" >&2
+        echo "This probably means distribution $ID is not supported by run-make-check.sh" >&2
+    fi
+
+    if ! type ccache > /dev/null 2>&1 ; then
+        echo "ERROR: ccache could not be installed"
+        exit 1
+    fi
+
+    if test -f ./install-deps.sh ; then
+           export WITH_SEASTAR=1
+           $DRY_RUN source ./install-deps.sh || return 1
+        trap clean_up_after_myself EXIT
+    fi
+
+    cat <<EOM
+Note that the binaries produced by this script do not contain correct time
+and git version information, which may make them unsuitable for debugging
+and production use.
+EOM
+    save_ccache_conf
+    # remove the entropy generated by the date/time embedded in the build
+    $DRY_RUN export SOURCE_DATE_EPOCH="946684800"
+    $DRY_RUN ccache -o sloppiness=time_macros
+    $DRY_RUN ccache -o run_second_cpp=true
+    if [ -n "$JENKINS_HOME" ]; then
+        # Build host has plenty of space available, let's use it to keep
+        # various versions of the built objects. This could increase the cache hit
+        # if the same or similar PRs are running several times
+        $DRY_RUN ccache -o max_size=100G
+    else
+        echo "Current ccache max_size setting:"
+        ccache -p | grep max_size
+    fi
+    $DRY_RUN ccache -sz # Reset the ccache statistics and show the current configuration
+}
+
+function configure() {
+    CMAKE_BUILD_OPTS="$@"
+    CMAKE_BUILD_OPTS+=$(detect_ceph_dev_pkgs)
+    $DRY_RUN ./do_cmake.sh $CMAKE_BUILD_OPTS $@ || return 1
+}
+
+function build() {
+    local targets="$@"
+    $DRY_RUN cd build
+    BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
+    test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
+    $DRY_RUN make $BUILD_MAKEOPTS $targets || return 1
+    $DRY_RUN ccache -s # print the ccache statistics to evaluate the efficiency
+}
+
+DEFAULT_MAKEOPTS=${DEFAULT_MAKEOPTS:--j$(get_processors)}
+
+if [ "$0" = "$BASH_SOURCE" ]; then
+    # not sourced
+    if [ `uname` = FreeBSD ]; then
+        GETOPT=/usr/local/bin/getopt
+    else
+        GETOPT=getopt
+    fi
+
+    options=$(${GETOPT} --name "$0" --options "" --longoptions "cmake-args:" -- "$@")
+    if [ $? -ne 0 ]; then
+        exit 2
+    fi
+    eval set -- "${options}"
+    while true; do
+        case "$1" in
+            --cmake-args)
+                cmake_args=$2
+                shift 2;;
+            --)
+                shift
+                break;;
+            *)
+                echo "bad option $1" >& 2
+                exit 2;;
+        esac
+    done
+    prepare
+    configure "$cmake_args"
+    build "$@"
+fi