From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 12 Aug 2016 15:52:25 +0000 (-0400)
Subject: ceph-dev-build add flavor var to ceph-release urls
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07217fa51c3e132fc6ba62b0bca5f6eb05d32417;p=ceph-build.git

ceph-dev-build add flavor var to ceph-release urls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index df3de3ae..a758ebf2 100644
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -124,7 +124,7 @@ Release:        0%{?dist}
 Summary:        Ceph Development repository configuration
 Group:          System Environment/Base
 License:        GPLv2
-URL:            ${chacra_url}r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/
+URL:            ${chacra_url}r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/flavors/$FLAVOR/
 Source0:        ceph.repo
 #Source0:        RPM-GPG-KEY-CEPH
 #Source1:        ceph.repo
@@ -189,7 +189,7 @@ EOF
 cat <<EOF > $BUILDAREA/SOURCES/ceph.repo
 [Ceph]
 name=Ceph packages for \$basearch
-baseurl=${chacra_url}/r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/\$basearch
+baseurl=${chacra_url}/r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/flavors/${FLAVOR}/\$basearch
 enabled=1
 gpgcheck=0
 type=rpm-md
@@ -197,7 +197,7 @@ gpgkey=https://download.ceph.com/keys/autobuild.asc
 
 [Ceph-noarch]
 name=Ceph noarch packages
-baseurl=${chacra_url}/r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/noarch
+baseurl=${chacra_url}/r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/flavors/${FLAVOR}/noarch
 enabled=1
 gpgcheck=0
 type=rpm-md
@@ -205,7 +205,7 @@ gpgkey=https://download.ceph.com/keys/autobuild.asc
 
 [ceph-source]
 name=Ceph source packages
-baseurl=${chacra_url}/r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/SRPMS
+baseurl=${chacra_url}/r/ceph/${chacra_ref}/${SHA1}/${DISTRO}/${RELEASE}/flavors/${FLAVOR}/SRPMS
 enabled=1
 gpgcheck=0
 type=rpm-md