ceph-deploy-build and radosgw-agent should use GIT_COMMIT

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-deploy-build/build/build b/ceph-deploy-build/build/build
index 87e60e7da422cfb35ee95028d0a52f1358a4112d..b8c1c4ef3ffbeaeb57dfd70ee2bffd1078c0a626 100644 (file)
--- a/ceph-deploy-build/build/build
+++ b/ceph-deploy-build/build/build
@@ -13,7 +13,7 @@ echo "  BPTAG=${BPTAG}"
 echo "  WS=$WORKSPACE"
 echo "  PWD=$(pwd)"
 echo "  BRANCH=$BRANCH"
-echo "  SHA1=$SHA1"
+echo "  SHA1=$GIT_COMMIT"
 
 # FIXME A very naive way to just list the RPM $DIST that we currently support.
 # We should be a bit more lenient to allow any rhel/centos/sles/suse
@@ -44,7 +44,7 @@ then
         RPM_BUILD=$(lsb_release -s -c)
 
         [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
-        chacra_endpoint="ceph-deploy/${chacra_ref}/${SHA1}/${DISTRO}/${DISTRO_VERSION}"
+        chacra_endpoint="ceph-deploy/${chacra_ref}/${GIT_COMMIT}/${DISTRO}/${DISTRO_VERSION}"
 
         # this exists in scripts/build_utils.sh for ceph-deploy, binaries have
         # no architecture so we POST them to 'noarch' for rpms
@@ -90,7 +90,7 @@ then
     [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH"
     # ceph-deploy isn't architecture dependant, so we use 'all' as architecture and
     # uses 'universal' to signal this is not specific to any distro version
-    chacra_endpoint="ceph-deploy/${chacra_ref}/${SHA1}/${DISTRO}/universal/all"
+    chacra_endpoint="ceph-deploy/${chacra_ref}/${GIT_COMMIT}/${DISTRO}/universal/all"
 
     # this exists in scripts/build_utils.sh
     check_binary_existence $chacra_endpoint

diff --git a/radosgw-agent/build/build b/radosgw-agent/build/build
index 7f1c4c40dc9816bf77056f92181d604b38569d73..ab3d4a43fc346a45f80845002c639e6863a422f3 100644 (file)
--- a/radosgw-agent/build/build
+++ b/radosgw-agent/build/build
@@ -9,7 +9,7 @@ echo "  BPTAG=${BPTAG}"
 echo "  WS=$WORKSPACE"
 echo "  PWD=$(pwd)"
 echo "  BRANCH=$BRANCH"
-echo "  SHA1=$SHA1"
+echo "  SHA1=$GIT_COMMIT"
 ls -l