From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 22 Aug 2019 01:31:01 +0000 (-0400)
Subject: ceph-iscsi-stable: query correct chacra host for uploads
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=32788cb9939e1387a55253380fdd39ee1b1c72dd;p=ceph-build.git

ceph-iscsi-stable: query correct chacra host for uploads

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/ceph-iscsi-stable/build/build_rpm b/ceph-iscsi-stable/build/build_rpm
index 47d48020..ad2e946d 100644
--- a/ceph-iscsi-stable/build/build_rpm
+++ b/ceph-iscsi-stable/build/build_rpm
@@ -77,7 +77,7 @@ fi
 
 if [ "$THROWAWAY" = false ] ; then
     # push binaries to chacra
-    find $WORKSPACE/dist/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source/
+    find $WORKSPACE/dist/SRPMS | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/source
     find $WORKSPACE/dist/RPMS/ | grep rpm | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/noarch/
     # start repo creation
     $VENV/chacractl repo update ${chacra_repo_endpoint}
diff --git a/ceph-iscsi-stable/build/setup b/ceph-iscsi-stable/build/setup
index a9d593df..0db402a8 100644
--- a/ceph-iscsi-stable/build/setup
+++ b/ceph-iscsi-stable/build/setup
@@ -47,6 +47,7 @@ export LC_ALL=C # the following is vulnerable to i18n
 pkgs=( "chacractl>=0.0.4" )
 install_python_packages "pkgs[@]"
 
-chacra_url="https://chacra.ceph.com/"
+# ask shaman which chacra instance to use
+chacra_url=`curl -f -u $SHAMAN_API_USER:$SHAMAN_API_KEY https://shaman.ceph.com/api/nodes/next/`
 # create the .chacractl config file using global variables
 make_chacractl_config $chacra_url