]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Merge pull request #1870 from ideepika/crimson-pkg-build
authorKefu Chai <kchai@redhat.com>
Sat, 10 Jul 2021 12:20:44 +0000 (20:20 +0800)
committerGitHub <noreply@github.com>
Sat, 10 Jul 2021 12:20:44 +0000 (20:20 +0800)
build_utils: specify buildprofiles for crimson build

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
scripts/build_utils.sh

index a3ac109884b3d930e6ad9ea176303c22b84d9e63,a7445d79ab748ce62027127a27dac472f874e5da..23634cd5256f6c95b16229ade8347ea4263d7f0e
@@@ -855,11 -851,8 +852,12 @@@ 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"
          ;;
 +    jaeger)
 +        CEPH_EXTRA_RPMBUILD_ARGS="--with jaeger"
 +        PROFILES="pkg.ceph.jaeger"
 +        ;;
      *)
          echo "unknown FLAVOR: ${FLAVOR}" >&2
          exit 1
@@@ -914,13 -907,8 +912,14 @@@ build_debs() 
  
      CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS $(extra_cmake_args)"
      DEB_BUILD_OPTIONS="parallel=$(get_nr_build_jobs)"
+     PROFILES="nocheck,$PROFILES"
  
 +    if [ -z "$PROFILES" ]; then
 +      PROFILES="nocheck,$PROFILES"
 +    else
 +      PROFILES="nocheck"
 +    fi
 +
      # pass only those env vars specifically noted
      sudo \
          CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS" \