<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/24212">View Change</a></p><div style="white-space:pre-wrap">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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: conflict: allow overriding pkgver<br><br>Allow overriding OSMO_OBS_CONFLICT_PKGVER, so we can increase the<br>version of the osmocom-2021q1 package whenever something changes on one<br>of the 2021q1 branches.<br><br>Related: SYS#5370<br>Change-Id: Iae45d7462aab8227ed3756e6cccfa3e64cb04211<br>---<br>M scripts/common-obs-conflict.sh<br>M scripts/osmocom-packages-docker.sh<br>2 files changed, 2 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs-conflict.sh b/scripts/common-obs-conflict.sh</span><br><span>index a4fc98d..b6b381a 100644</span><br><span>--- a/scripts/common-obs-conflict.sh</span><br><span>+++ b/scripts/common-obs-conflict.sh</span><br><span>@@ -2,7 +2,7 @@</span><br><span> # Create conflicting dummy packages in OBS (opensuse build service), so users can't mix packages</span><br><span> # built from different branches by accident</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OSMO_OBS_CONFLICT_PKGVER="1.0.0"</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_OBS_CONFLICT_PKGVER="${OSMO_OBS_CONFLICT_PKGVER:-1.0.0}"</span><br><span> </span><br><span> # Create the conflicting package for debian</span><br><span> #</span><br><span>diff --git a/scripts/osmocom-packages-docker.sh b/scripts/osmocom-packages-docker.sh</span><br><span>index 66eb311..4465d20 100755</span><br><span>--- a/scripts/osmocom-packages-docker.sh</span><br><span>+++ b/scripts/osmocom-packages-docker.sh</span><br><span>@@ -26,6 +26,7 @@</span><br><span> </span><br><span> docker run \</span><br><span>    -e "FEED=$FEED" \</span><br><span style="color: hsl(120, 100%, 40%);">+   -e "OSMO_OBS_CONFLICT_PKGVER=$OSMO_OBS_CONFLICT_PKGVER" \</span><br><span>  -e "PACKAGES=$PACKAGES" \</span><br><span>  -e "PROJ=$PROJ" \</span><br><span>  -v "$SCRIPTS:/scripts" \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/24212">change 24212</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/24212"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iae45d7462aab8227ed3756e6cccfa3e64cb04211 </div>
<div style="display:none"> Gerrit-Change-Number: 24212 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>