ceph*setup: Rewrite the src/ceph_version file to accurately reflect release type

All Ceph binaries are currently being built with this to say "stable"

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 07a304e928af757535894a9f3d103cc8cecb0732..79392bedad1f36bdda01c95d6be62422df7986fa 100644 (file)
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -81,6 +81,8 @@ echo current version $cephver
 
 srcdir=`pwd`
 
+rewrite_ceph_version_file
+
 if [ -d "$releasedir/$cephver" ]; then
     echo "$releasedir/$cephver already exists; reuse that release tarball"
 else

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 5c5af0dc7f94b489804d2063d15937106c643633..5475644b0f98777b49957bf97fd24ba47a3ffa43 100644 (file)
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -74,6 +74,8 @@ echo current version $cephver
 
 srcdir=`pwd`
 
+rewrite_ceph_version_file
+
 if [ -d "$releasedir/$cephver" ]; then
     echo "$releasedir/$cephver already exists; reuse that release tarball"
 else

diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 05fe2161ac5088538c6040b6596d523466372b65..e4c46e6ae607dc10ffbd2e36c5ddca4f6bfdca12 100644 (file)
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -72,6 +72,8 @@ echo current version $cephver
 
 srcdir=`pwd`
 
+rewrite_ceph_version_file
+
 if [ -d "$releasedir/$cephver" ]; then
     echo "$releasedir/$cephver already exists; reuse that release tarball"
 else

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index eb92b3232a7025754eedb64e668d702ed0880210..806562831e3816b60e5c8d41b1d7991a2dcc50e0 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1657,3 +1657,19 @@ function set_centos_python3_version() {
     sudo dnf reinstall -y $EXPECTED_PYTHON3_VERSION || sudo dnf install -y $EXPECTED_PYTHON3_VERSION
     sudo ln -fs /usr/bin/$EXPECTED_PYTHON3_VERSION /usr/bin/python3
 }
+
+# rewrites src/ceph_release with the appropriate release type.
+# in the ceph-setup job, $RELEASE_TYPE will be defined.
+# in ceph-dev-{setup,new-setup}, it's not defined so it's a dev release
+function rewrite_ceph_version_file() {
+    if [ "$RELEASE_TYPE" == "STABLE" ]; then
+      echo "Writing 'stable' to src/ceph_release file"
+      sed -i '$ s/.*/stable/g' src/ceph_release
+    elif [ "$RELEASE_TYPE" == "RELEASE_CANDIDATE" ]; then
+      echo "Writing 'rc' to src/ceph_release file"
+      sed -i '$ s/.*/rc/g' src/ceph_release
+    else
+      echo "Writing 'dev' to src/ceph_release file"
+      sed -i '$ s/.*/dev/g' src/ceph_release
+    fi
+}