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 <dmick@redhat.com>

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index 99166a16692bb53a7a301acef56ea4e6365247a1..e4f28e0ba6e41a8fb4a931662c2b1e0d4cf3e75f 100644 (file)
--- 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 05b67db60929ba0d930ac06994852c9733369c0e..4851f8c3dfe82bec7d5ad377349072ace4d4d29a 100644 (file)
--- 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 37751068f80d78829fc9a08384d3b5ed1fdae151..3b37fdbea99deed1b7750251fe87e791c70a992f 100644 (file)
--- 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 364edabd3ca120247598d52eb0b968e246663271..a5e813d3bcb02d6903f8b8e9052ff8d748a5722d 100644 (file)
--- 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
 {