From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 19 Oct 2016 17:14:52 +0000 (-0500)
Subject: ceph-build: set FLAVOR to default
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5f8925cd74760f4432e505a960f92d7661a362a3;p=ceph-build.git

ceph-build: set FLAVOR to default

We don't build multiple flavors for upstream releases, but we use the
full chacra url when uploading binaries and updating repos.

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

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index 779fbff0..1718a66f 100644
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -107,6 +107,8 @@ install_python_packages "pkgs[@]"
 
 make_chacractl_config
 
+FLAVOR="default"
+
 # look for a specific package to tell if we can avoid the build
 chacra_endpoint="ceph/${chacra_ref}/${SHA1}/${distro}/${DIST}/${ARCH}/flavors/${FLAVOR}"
 chacra_repo_endpoint="ceph/${chacra_ref}/${SHA1}/${distro}/${DIST}/flavors/${FLAVOR}"
diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 4a5d1094..31255f53 100644
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -123,6 +123,8 @@ echo dist $dist
 vers=`cat ./dist/version`
 chacra_ref="$BRANCH"
 
+FLAVOR="default"
+
 chacra_endpoint="ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}"
 chacra_check_url="${chacra_endpoint}/${ARCH}/flavors/${FLAVOR}/librados2-${vers}-0.${DIST}.${ARCH}.rpm"