Change in osmo-ci[master]: OBS: conflict: move pkgver to global variable

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22215 )


Change subject: OBS: conflict: move pkgver to global variable
......................................................................

OBS: conflict: move pkgver to global variable

Prepare to move the 'put in git repository' code from _deb to the main
function by having the pkgver available outside of the _deb function.

Change the version to 1.0.0 while at it, as it looks better than 0.0.0.

Related: OS#4733
Change-Id: Ic56ff12b5f2fe596d73b341e1e7750a9e202ed6b
---
M scripts/common-obs-conflict.sh
1 file changed, 4 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/22215/1

diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh
index 57679c3..ec877a1 100644
--- a/scripts/common-obs-conflict.sh
+++ b/scripts/common-obs-conflict.sh
@@ -2,6 +2,8 @@
 # Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages
 # built from different branches by accident
 
+OSMO_OBS_CONFLICT_PKGVER="1.0.0"
+
 # Create the conflicting package for debian
 #
 # $1: name of dummy package (e.g. "osmocom-nightly")
@@ -20,7 +22,6 @@
 osmo_obs_prepare_conflict_deb() {
 	local pkgname="$1"
 	shift
-	local pkgver="0.0.0"
 	local oldpwd="$PWD"
 
 	mkdir -p "$pkgname/debian/source"
@@ -56,7 +57,7 @@
 
 	# Fill changelog
 	cat << EOF > changelog
-${pkgname} (${pkgver}) unstable; urgency=medium
+${pkgname} (${OSMO_OBS_CONFLICT_PKGVER}) unstable; urgency=medium
 
   * Dummy package, which conflicts with: $@
 
@@ -81,7 +82,7 @@
 	git init .
 	git add -A
 	git commit -m "auto-commit: $pkgname dummy package" || true
-	git tag -f "$pkgver"
+	git tag -f "$OSMO_OBS_CONFLICT_PKGVER"
 
 	cd "$oldpwd"
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22215
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ic56ff12b5f2fe596d73b341e1e7750a9e202ed6b
Gerrit-Change-Number: 22215
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210115/3c986b6c/attachment.htm>