From a1a7e0177d6f5d2ff8bafffd471944da7c134b17 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Fri, 24 Sep 2021 14:03:43 -0700 Subject: [PATCH] ceph-*-build: add step to extract and store cephadm binary For deb builds, this is all in build_utils.sh; for rpm, it's in build_rpm for each build Signed-off-by: Dan Mick --- ceph-build/build/build_rpm | 3 +++ ceph-dev-build/build/build_rpm | 3 +++ ceph-dev-new-build/build/build_rpm | 3 +++ scripts/build_utils.sh | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm index 99166a16..e4f28e0b 100644 --- a/ceph-build/build/build_rpm +++ b/ceph-build/build/build_rpm @@ -36,6 +36,9 @@ if [ "$THROWAWAY" = false ] ; then # push binaries to chacra 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 + rpm2cpio ${BUILDAREA}/RPMS/noarch/cephadm-*.rpm | cpio -i --to-stdout *sbin/cephadm > cephadm + echo cephadm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR} # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF { diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 05b67db6..4851f8c3 100644 --- a/ceph-dev-build/build/build_rpm +++ b/ceph-dev-build/build/build_rpm @@ -54,6 +54,9 @@ if [ "$THROWAWAY" = false ] ; then # push binaries to chacra find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source/flavors/${FLAVOR} find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR} + # extract cephadm + rpm2cpio ${BUILDAREA}/RPMS/noarch/cephadm-*.rpm | cpio -i --to-stdout *sbin/cephadm > cephadm + echo cephadm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR} # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF { diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm index 37751068..3b37fdbe 100644 --- a/ceph-dev-new-build/build/build_rpm +++ b/ceph-dev-new-build/build/build_rpm @@ -55,6 +55,9 @@ if [ "$THROWAWAY" = false ] ; then # push binaries to chacra find release/${vers}/rpm/*/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source/flavors/${FLAVOR} find release/${vers}/rpm/*/RPMS/* | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR} + # extract cephadm + rpm2cpio ${BUILDAREA}/RPMS/noarch/cephadm-*.rpm | cpio -i --to-stdout *sbin/cephadm > cephadm + echo cephadm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/flavors/${FLAVOR} # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF { diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 364edabd..a5e813d3 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -946,6 +946,11 @@ build_debs() { egrep "*\.(changes|deb|ddeb|dsc|gz)$" | \ egrep -v "(Packages|Sources|Contents)" | \ $venv/chacractl binary ${chacra_flags} create ${chacra_endpoint} + + # extract cephadm binary and push + dpkg-deb --fsys-tarfile release/${vers}/cephadm_${vers}*.deb | tar -x -f - --strip-components=3 ./usr/sbin/cephadm + echo cephadm | $venv/chacractl binary ${chacra_flags} create ${chacra_endpoint} + # write json file with build info cat > $WORKSPACE/repo-extra.json << EOF { -- 2.39.5