<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23947">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: nightly: no change to osmocom-$FEED changelog<br><br>Skip the logic to generate a new debian/changelog version for<br>osmocom-nightly and osmocom-next packages in build(). Use<br>$OSMO_OBS_CONFLICT_PKGVER instead, as it gets written to<br>debian/changelog in common-obs-conflict.sh already, and append the date<br>to the variable.<br><br>Related: OS#5135<br>Change-Id: I85f0bcb633c16c7b5a81104f198d9561f53c0c01<br>---<br>M scripts/osmocom-nightly-packages.sh<br>1 file changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index c90ed2f..6ae8a26 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -11,6 +11,7 @@</span><br><span> set -x</span><br><span> </span><br><span> DT=$(date +%Y%m%d%H%M)</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_OBS_CONFLICT_PKGVER="$OSMO_OBS_CONFLICT_PKGVER.$DT"</span><br><span> TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX)</span><br><span> </span><br><span> # Set FEED and PROJ, based on the FEED env var</span><br><span>@@ -117,7 +118,7 @@</span><br><span>   local gitbpargs=$3</span><br><span>   local repodir=$REPO/$name</span><br><span>   local oscdir=$REPO/osc/$PROJ/$name</span><br><span style="color: hsl(0, 100%, 40%);">-  local dependver="$OSMO_OBS_CONFLICT_PKGVER.$DT"</span><br><span style="color: hsl(120, 100%, 40%);">+  local dependver="$OSMO_OBS_CONFLICT_PKGVER"</span><br><span> </span><br><span>   if [ -z "$changelog" ] ; then</span><br><span>     changelog=commit</span><br><span>@@ -239,7 +240,7 @@</span><br><span>   osmo_obs_checkout_copy debian8 osmo-gsm-manuals</span><br><span>   osmo_obs_checkout_copy debian8 osmo-trx</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  build osmocom-$FEED</span><br><span style="color: hsl(120, 100%, 40%);">+  build osmocom-$FEED no_commit</span><br><span>   build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span>   build osmo-gsm-manuals</span><br><span>   build osmo-gsm-manuals-debian8</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/23947">change 23947</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/+/23947"/><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: I85f0bcb633c16c7b5a81104f198d9561f53c0c01 </div>
<div style="display:none"> Gerrit-Change-Number: 23947 </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>