Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

untested: suggestion for avoiding source package upload #2237

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

untested: suggestion for avoiding source package upload #2237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ceph-build/build/build_rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion scripts/build_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down