nfs-ganesha: fix devel builds

since recent changes in shaman, the query for setting `REPO_URL` must be
updated.
This should fix the builds that are currently broken.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index e25f5b7888dff6a90035c5209573b8d9c0a2b93d..19ca249cc4094ba4f6eeb625f0476d46a8d9e512 100644 (file)
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -6,7 +6,7 @@ if test "$DISTRO" != "debian" -a "$DISTRO" != "ubuntu"; then
     exit 0
 fi
 
-REPO_URL="https://shaman.ceph.com/api/repos/ceph/$CEPH_BRANCH/$CEPH_SHA1/$DISTRO/$DIST/repo"
+REPO_URL=$(curl -s "https://shaman.ceph.com/api/search/?status=ready&project=ceph&flavor=default&distros=${DISTRO}%2F${DIST}%2F${ARCH}&ref=${CEPH_BRANCH}" | jq -a ".[0] | .url" | tr -d '"')
 TIME_LIMIT=1200
 INTERVAL=30
 REPO_FOUND=0

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index a0e435009c26dbffa9f6af6fa5061c2475170fa2..6339f11a8c1e7f9f6600647f69e2e5312c5f26d6 100644 (file)
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -28,7 +28,7 @@ sudo yum -y remove librgw-devel librgw2 librados-devel librados3 libcephfs-devel
 sudo yum -y autoremove
 
 # Get .repo file from appropriate shaman build
-REPO_URL="https://shaman.ceph.com/api/repos/ceph/$CEPH_BRANCH/$CEPH_SHA1/$DISTRO/$RELEASE/flavors/default/repo"
+REPO_URL=$(curl -s "https://shaman.ceph.com/api/search/?status=ready&project=ceph&flavor=default&distros=${DISTRO}%2F${RELEASE}%2F${ARCH}&ref=${CEPH_BRANCH}" | jq -a ".[0] | .url" | tr -d '"')
 TIME_LIMIT=1200
 INTERVAL=30
 REPO_FOUND=0