From 27c8de023b6084c6a94604491cdeb34bc3cb1feb Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 17 Mar 2021 11:29:50 +0100 Subject: [PATCH] nfs-ganesha: fix wrong url for setting REPO_URL 7173ede7ec472b555c137093cb30e272ce1868cd was an attempt to fix the nfs-ganesha job but it's using the wrong url. This commit fixes it. Signed-off-by: Guillaume Abrioux --- nfs-ganesha/build/build_deb | 2 +- nfs-ganesha/build/build_rpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb index 19ca249c..3dfffbc9 100644 --- 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=$(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 '"') +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] | .chacra_url" | tr -d '"')repo TIME_LIMIT=1200 INTERVAL=30 REPO_FOUND=0 diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm index 6339f11a..838214f4 100644 --- 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=$(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 '"') +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] | .chacra_url" | tr -d '"')repo TIME_LIMIT=1200 INTERVAL=30 REPO_FOUND=0 -- 2.47.3