From: Boris Ranto <branto@redhat.com>
Date: Wed, 2 Nov 2016 16:16:41 +0000 (+0100)
Subject: calamari: Fix-up deb and rpm builds
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74a8864393ce1054d82f20af8a5dc52fdce23ddd;p=ceph-build.git

calamari: Fix-up deb and rpm builds

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/calamari/build/build_deb b/calamari/build/build_deb
index 9f5d2e57..826d9c46 100644
--- a/calamari/build/build_deb
+++ b/calamari/build/build_deb
@@ -9,12 +9,12 @@ fi
 
 ## Install any setup-time deps
 # We need this for mk-build-deps
-sudo apt-get install equivs
+sudo apt-get install -y equivs
 
 # Run the install-deps.sh upstream script if it exists
 if [ -x install-deps.sh ]; then
     echo "Ensuring dependencies are installed"
-    ./install-deps.sh
+    sudo ./install-deps.sh
 fi
 
 
diff --git a/calamari/build/build_rpm b/calamari/build/build_rpm
index df2c5739..494609dc 100644
--- a/calamari/build/build_rpm
+++ b/calamari/build/build_rpm
@@ -9,12 +9,12 @@ fi
 
 ## Install any setup-time deps (to make dist package)
 # We need this to get the major version from lsb_release
-yum install -y redhat-lsb-core
+sudo yum install -y redhat-lsb-core mock
 
 # Run the install-deps.sh upstream script if it exists
 if [ -x install-deps.sh ]; then
     echo "Ensuring dependencies are installed"
-    ./install-deps.sh
+    sudo ./install-deps.sh
 fi
 
 
@@ -36,7 +36,7 @@ sed -e "s/@VERSION@/${VERSION}/g" -e "s/@RELEASE@/${RPM_RELEASE}/g" < calamari-s
 
 
 ## Install the build-time dependencies (for rpmbuild -bs)
-sudo yum-builddep -y dist/calamari.spec
+sudo yum-builddep -y dist/calamari-server.spec
 
 
 ## Create the source rpm
@@ -56,7 +56,7 @@ SRPM=$(readlink -f *.src.rpm)
 
 ## Build the binaries with mock
 echo "Building RPMs"
-sudo mock -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=./dist/rpm/"%(dist)s"/"%(target_arch)s"/ ${SRPM}
+sudo mock -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=./dist/rpm/ ${SRPM}
 
 
 ## Upload the created RPMs to chacra
@@ -65,7 +65,7 @@ chacra_endpoint="calamari/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
 # push binaries to chacra
-find ~/rpmbuild/ | egrep '\.rpm$' | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/$ARCH/
+find ./dist/rpm/ | egrep '\.rpm$' | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/$ARCH/
 
 # start repo creation
 $VENV/chacractl repo update ${chacra_endpoint}
diff --git a/calamari/config/definitions/calamari.yml b/calamari/config/definitions/calamari.yml
index 68dda871..1a2c0416 100644
--- a/calamari/config/definitions/calamari.yml
+++ b/calamari/config/definitions/calamari.yml
@@ -14,7 +14,7 @@
       - string:
           name: DISTROS
           description: "A list of distros to build for. Available options are: xenial, centos7, centos6, trusty, precise, wheezy, and jessie"
-          default: "centos7 precise xenial"
+          default: "centos7 xenial"
 
       - string:
           name: ARCHS