From: David Galloway <dgallowa@redhat.com>
Date: Thu, 3 Sep 2020 17:02:11 +0000 (-0400)
Subject: ceph*setup: Abbreviate the tag
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1652%2Fhead;p=ceph-build.git

ceph*setup: Abbreviate the tag

I don't know what changed or when but `git describe` started returning a longer string.  Our tooling relies on there only being 8 characters in the last portion of the version so we need to keep naming our packages that way.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index b87a8ad1..f7c2c1b7 100644
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -26,7 +26,7 @@ if [ -x "$BRANCH" ] ; then
     exit 1
 fi
 
-echo "Building version $(git describe) Branch $BRANCH"
+echo "Building version $(git describe --abbrev=8) Branch $BRANCH"
 
 rm -rf dist
 rm -rf release
@@ -96,7 +96,7 @@ mkdir -p release
 releasedir='release'
 versionfile='release/version'
 
-cephver=`git describe --match "v*" | sed s/^v//`
+cephver=`git describe --abbrev=8 --match "v*" | sed s/^v//`
 echo current version $cephver
 
 srcdir=`pwd`
diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 6832afe8..3700d370 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -19,7 +19,7 @@ if [ -x "$BRANCH" ] ; then
     exit 1
 fi
 
-echo "Building version $(git describe) Branch $BRANCH"
+echo "Building version $(git describe --abbrev=8) Branch $BRANCH"
 
 rm -rf dist
 rm -rf release
@@ -87,7 +87,7 @@ mkdir -p release
 releasedir='release'
 versionfile='release/version'
 
-cephver=`git describe --match "v*" | sed s/^v//`
+cephver=`git describe --abbrev=8 --match "v*" | sed s/^v//`
 echo current version $cephver
 
 srcdir=`pwd`
diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 61b437b0..7bca374c 100644
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -14,7 +14,7 @@ if [ -x "$BRANCH" ] ; then
     exit 1
 fi
 
-echo "Building version $(git describe) Branch $BRANCH"
+echo "Building version $(git describe --abbrev=8) Branch $BRANCH"
 
 rm -rf dist
 rm -rf release
@@ -74,7 +74,7 @@ mkdir -p release
 releasedir='release'
 versionfile='release/version'
 
-cephver=`git describe --match "v*" | sed s/^v//`
+cephver=`git describe --abbrev=8 --match "v*" | sed s/^v//`
 echo current version $cephver
 
 srcdir=`pwd`