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 779fbff05a0e13ddb972464cd9ef8203d8a10dac..1718a66fb38e154d693085cda1f4abf72b20058a 100644 (file)
--- 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 4a5d10947968f8a9682d18c9f7006853361762a5..31255f53dc0c5ee3196f592e28436a431fb46c7a 100644 (file)
--- 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"