From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Wed, 7 Jul 2021 17:40:40 +0000 (+0530)
Subject: update extrapkg needed for crimson, to be added by debian buildprofiles
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7775ca32ebe72c3756b42aec0077153efd903649;p=ceph-build.git

update extrapkg needed for crimson, to be added by debian buildprofiles

cleanup: add/ remove some missing go to have comments

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

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 09677d0a..7ce59897 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
@@ -101,7 +101,7 @@
                     FORCE=True
                     DISTROS=focal bionic centos7 centos8 leap15
       # build pacific on:
-      # default: focal bionic centos8 leap15
+      # default: focal bionic centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -154,6 +154,7 @@
                     ARCHS=x86_64
       # Build only the `crimson` flavour, don't waste resources on the default one.
       # Useful for the crimson's bug-hunt at Sepia
+      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
           regex: .*crimson-only.*
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 0c1372fc..a7445d79 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -605,9 +605,6 @@ setup_pbuilder() {
 
     #in case it needs to update/add repo, the following packages should installed.
     extrapackages="software-properties-common curl"
-    if [ $FLAVOR = "crimson" ]; then
-	extrapackages += " libc-ares-dev libcrypto++-dev libgnutls28-dev libhwloc-dev libnuma-dev libpciaccess-dev libprotobuf-dev libsctp-dev libyaml-cpp-dev protobuf-compiler ragel systemtap-sdt-dev"
-    fi
     echo "EXTRAPACKAGES=\"${extrapackages}\"" >> ~/.pbuilderrc
 
     local opts
@@ -854,6 +851,7 @@ ceph_build_args_from_flavor() {
         CEPH_EXTRA_RPMBUILD_ARGS="--with seastar"
         CEPH_EXTRA_CMAKE_ARGS+=" -DCMAKE_BUILD_TYPE=Debug"
         CEPH_EXTRA_CMAKE_ARGS+=" -DWITH_SEASTAR=ON"
+        PROFILES="pkg.ceph.crimson"
         ;;
     *)
         echo "unknown FLAVOR: ${FLAVOR}" >&2
@@ -909,6 +907,7 @@ build_debs() {
 
     CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)"
     DEB_BUILD_OPTIONS="parallel=$(get_nr_build_jobs)"
+    PROFILES="nocheck,$PROFILES"
 
     # pass only those env vars specifically noted
     sudo \
@@ -918,7 +917,7 @@ build_debs() {
         --distribution $DIST \
         --basetgz $pbuilddir/$DIST.tgz \
         --buildresult $releasedir/$cephver \
-        --profiles nocheck \
+        --profiles $PROFILES \
         --use-network yes \
         $releasedir/$cephver/ceph_$bpvers.dsc