install-deps: make jaeger package install default, removes with_jaeger

flag

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

diff --git a/install-deps.sh b/install-deps.sh
index dcf988696352c9672f236f42667100866a67dca5..5373a9260bfacecfb2134c0bfcf09a4aac73c202 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -34,17 +34,12 @@ function munge_ceph_spec_in {
     shift
     local for_make_check=$1
     shift
-    local with_jaeger=$1
-    shift
     local OUTFILE=$1
     sed -e 's/@//g' < ceph.spec.in > $OUTFILE
     # http://rpm.org/user_doc/conditional_builds.html
     if $with_seastar; then
         sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE
     fi
-    if $with_jaeger; then
-        sed -i -e 's/%bcond_with jaeger/%bcond_without jaeger/g' $OUTFILE
-    fi
     if $with_zbd; then
         sed -i -e 's/%bcond_with zbd/%bcond_without zbd/g' $OUTFILE
     fi
@@ -63,10 +58,6 @@ function munge_debian_control {
            grep -v babeltrace debian/control > $control
            ;;
     esac
-    if $with_jaeger; then
-       sed -i -e 's/^# Jaeger[[:space:]]//g' $control
-       sed -i -e 's/^# Crimson      libyaml-cpp-dev,/d' $control
-    fi
     echo $control
 }
 
@@ -316,7 +307,6 @@ if [ x$(uname)x = xFreeBSDx ]; then
     exit
 else
     [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false
-    [ $WITH_JAEGER ] && with_jaeger=true || with_jaeger=false
     [ $WITH_ZBD ] && with_zbd=true || with_zbd=false
     [ $WITH_PMEM ] && with_pmem=true || with_pmem=false
     [ $WITH_RADOSGW_MOTR ] && with_rgw_motr=true || with_rgw_motr=false
@@ -368,9 +358,6 @@ else
        if $with_seastar; then
            build_profiles+=",pkg.ceph.crimson"
        fi
-       if $with_jaeger; then
-           build_profiles+=",pkg.ceph.jaeger"
-       fi
 
         in_jenkins && cat <<EOF
 CI_DEBUG: for_make_check=$for_make_check
@@ -435,7 +422,7 @@ EOF
                 fi
                 ;;
         esac
-        munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $with_jaeger $DIR/ceph.spec
+        munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $DIR/ceph.spec
         # for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel
         $SUDO dnf install -y python3-devel
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
@@ -455,7 +442,7 @@ EOF
         echo "Using zypper to install dependencies"
         zypp_install="zypper --gpg-auto-import-keys --non-interactive install --no-recommends"
         $SUDO $zypp_install systemd-rpm-macros rpm-build || exit 1
-        munge_ceph_spec_in $with_seastar false $for_make_check $with_jaeger $DIR/ceph.spec
+        munge_ceph_spec_in $with_seastar false $for_make_check $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
         ;;
     *)