From 5f8925cd74760f4432e505a960f92d7661a362a3 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 19 Oct 2016 12:14:52 -0500 Subject: [PATCH] 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 --- ceph-build/build/setup_deb | 2 ++ ceph-build/build/setup_rpm | 2 ++ 2 files changed, 4 insertions(+) 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" -- 2.39.5