From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 5 Nov 2015 17:13:42 +0000 (-0600)
Subject: ceph-deploy: push the rpm binaries to chacra
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65a88c6357b20bfa9fe218aae4974bbc1e52bdff;p=ceph-build.git

ceph-deploy: push the rpm binaries to chacra

This also removes the repo creation from this job because that'll be
done by chacra now.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build
index 5417ec44..932db271 100644
--- a/ceph-deploy/build/build
+++ b/ceph-deploy/build/build
@@ -19,6 +19,9 @@ echo "  BRANCH=$BRANCH"
 rpm_dists="rhel centos6 centos7 centos"
 deb_dists="precise wheezy squeeze trusty jessie"
 
+# activate the virtualenv
+source $WORKSPACE/venv/bin/activate
+
 # A helper to match an item in a list of items, like python's `if item in list`
 listcontains() {
   for word in $2; do
@@ -38,17 +41,26 @@ then
         BUILDAREA=./rpmbuild
         DIST=el6
         RPM_BUILD=$(lsb_release -s -c)
+        DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
+        DISTRO=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
+
+        [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
+        chacra_endpoint="ceph/${chacra_ref}/${DISTRO}/${DISTRO_VERSION}"
+
+        # prevent early exit from a non-zero exit because we use `set -e`
+        ! chacractl exists binaries/${chacra_endpoint}/${ARCH} ; exists=$? || true
+
+        # if the binary already exists in chacra, do not rebuild
+        if [ $exists -eq 0 ] && [ "$FORCE" = false ] ; then
+            echo "The endpoint at ${chacra_endpoint}/${ARCH} already exists and FORCE was not set, Exiting..."
+            exit 0
+        fi
 
         if [ ! -e setup.py ] ; then
             echo "Are we in the right directory"
             exit 1
         fi
 
-        if ! CREATEREPO=`which createrepo` ; then
-            echo "Please install the createrepo package"
-            exit 4
-        fi
-
         # Create Tarball
         python setup.py sdist --formats=bztar
 
@@ -60,18 +72,10 @@ then
         echo "buildarea is: ${BUILDAREA}"
         rpmbuild -ba --define "_topdir ${BUILDAREA}" --define "_unpackaged_files_terminate_build 0" ${BUILDAREA}/SPECS/ceph-deploy.spec
 
-        # create repo
-        DEST=${REPO}/${DIST}
-        mkdir -p ${REPO}/${DIST}
-        cp -r ${BUILDAREA}/*RPMS ${DEST}
-
-        # Construct repodata
-        for dir in ${DEST}/SRPMS ${DEST}/RPMS/*
-        do
-            if [ -d $dir ] ; then
-                createrepo $dir
-            fi
-        done
+        [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
+
+        find ${BUILDAREA}/SRPMS | grep rpm | chacractl binary ${chacra_flags} create ${chacra_baseurl}/source
+        find ${BUILDAREA}/RPMS/* | grep rpm | chacractl binary ${chacra_flags} create ${chacra_baseurl}/${ARCH}
 
         cd $WORKSPACE
         mkdir -p dist