Change in osmo-ci[master]: OBS: conflict: allow overriding pkgver

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/24212 )

Change subject: OBS: conflict: allow overriding pkgver
......................................................................

OBS: conflict: allow overriding pkgver

Allow overriding OSMO_OBS_CONFLICT_PKGVER, so we can increase the
version of the osmocom-2021q1 package whenever something changes on one
of the 2021q1 branches.

Related: SYS#5370
Change-Id: Iae45d7462aab8227ed3756e6cccfa3e64cb04211
---
M scripts/common-obs-conflict.sh
M scripts/osmocom-packages-docker.sh
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved; Verified



diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh
index a4fc98d..b6b381a 100644
--- a/scripts/common-obs-conflict.sh
+++ b/scripts/common-obs-conflict.sh
@@ -2,7 +2,7 @@
 # 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"
+OSMO_OBS_CONFLICT_PKGVER="${OSMO_OBS_CONFLICT_PKGVER:-1.0.0}"
 
 # Create the conflicting package for debian
 #
diff --git a/scripts/osmocom-packages-docker.sh b/scripts/osmocom-packages-docker.sh
index 66eb311..4465d20 100755
--- a/scripts/osmocom-packages-docker.sh
+++ b/scripts/osmocom-packages-docker.sh
@@ -26,6 +26,7 @@
 
 docker run \
 	-e "FEED=$FEED" \
+	-e "OSMO_OBS_CONFLICT_PKGVER=$OSMO_OBS_CONFLICT_PKGVER" \
 	-e "PACKAGES=$PACKAGES" \
 	-e "PROJ=$PROJ" \
 	-v "$SCRIPTS:/scripts" \

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iae45d7462aab8227ed3756e6cccfa3e64cb04211
Gerrit-Change-Number: 24212
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210517/7d9849e0/attachment.htm>