From d0e059cbe6443262c401398973b3100c1cec0fa2 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 14 May 2024 12:34:06 -0700 Subject: [PATCH] untested: suggestion for avoiding source package upload when building RELEASE_TYPE=SECURITY, don't send source packages to chacra. Signed-off-by: Dan Mick --- ceph-build/build/build_rpm | 2 +- scripts/build_utils.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm index 2393951c5..1fc75a215 100644 --- a/ceph-build/build/build_rpm +++ b/ceph-build/build/build_rpm @@ -35,7 +35,7 @@ cd "$WORKSPACE" if [ "$THROWAWAY" = false ] ; then # push binaries to chacra - find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source + [ "RELEASE_TYPE" != "SECURITY" ] && find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH} # extract cephadm if it exists if [ -f ${BUILDAREA}/RPMS/noarch/cephadm-*.rpm ] ; then diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 37e103330..508f1a998 100755 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -984,8 +984,11 @@ build_debs() { if [ "$THROWAWAY" = false ] ; then # push binaries to chacra + egrep_pattern="*(\.changes|\.deb|\.ddeb|\.dsc|ceph[^/]*\.gz)$" + [ "$RELEASE_TYPE" = "SECURITY" ] && egrep_pattern = "*(\.deb\.ddeb)%" + find release/$vers/ | \ - egrep "*(\.changes|\.deb|\.ddeb|\.dsc|ceph[^/]*\.gz)$" | \ + egrep "$egrep_pattern" | \ egrep -v "(Packages|Sources|Contents)" | \ $venv/chacractl binary ${chacra_flags} create ${chacra_endpoint}