Project

General

Profile

Bug #5046

osmo-release.sh doesn't support epoch!=0

Added by pespin 2 months ago. Updated 2 months ago.

Status:
Resolved
Priority:
Normal
Assignee:
Category:
-
Target version:
-
Start date:
02/24/2021
Due date:
% Done:

100%

Spec Reference:

Description

When osmo-gbproxy was splitted from osmo-sgsn.git into its own somo-gbproxy.git, epoch was increased to 1 in order to have lower tagged released not conflicting with higher versions from old repo.
see osmo-gbproxy.git a8fa5671170580cdd8ae653e7811cfd1f1c2b36c

As a result, osmo-release.sf fails to generate a new release (happened when generating new release 0.1.0) since it doesn't handle epoch properly and "gbp dch" fails due to detecting old tag has epoch 1 while NEW_VER has epoch 0 (no "<number>:" prefix).

I was able to temporarily release it by doing this adhoc changes to osmo-release.sh:

diff --git a/osmo-release.sh b/osmo-release.sh
index eea17cf9..55c26151 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -247,7 +247,7 @@ if [ -f "TODO-RELEASE" ]; then
        git add TODO-RELEASE
 fi

-gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" 
+gbp dch --debian-tag='%(version)s' --meta --git-author --multimaint-merge --ignore-branch --new-version="1:$NEW_VER" -s 3385506bb63747a810948fddff6f8d1c1d98c8ac
 dch -r -m --distribution "unstable" "" 
 git add ${GIT_TOPDIR}/debian/changelog
 bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty

Associated revisions

Revision b76811b1 (diff)
Added by osmith 2 months ago

osmo-release.sh: support epoch

Related: OS#5046
Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598

History

#1 Updated by osmith 2 months ago

  • Status changed from New to In Progress
  • Assignee changed from pespin to osmith
  • % Done changed from 0 to 90

Attempt to fix it, please review (not sure how you use osmo-release.sh exactly):

https://gerrit.osmocom.org/c/libosmocore/+/23112

#2 Updated by osmith 2 months ago

  • Status changed from In Progress to Resolved
  • % Done changed from 90 to 100

Also available in: Atom PDF

Add picture from clipboard (Maximum size: 48.8 MB)