Change in osmo-ci[master]: OBS: nightly: no change to osmocom-$FEED changelog

osmith gerrit-no-reply at
Thu Apr 29 14:08:35 UTC 2021

osmith has submitted this change. ( )

Change subject: OBS: nightly: no change to osmocom-$FEED changelog

OBS: nightly: no change to osmocom-$FEED changelog

Skip the logic to generate a new debian/changelog version for
osmocom-nightly and osmocom-next packages in build(). Use
$OSMO_OBS_CONFLICT_PKGVER instead, as it gets written to
debian/changelog in already, and append the date
to the variable.

Related: OS#5135
Change-Id: I85f0bcb633c16c7b5a81104f198d9561f53c0c01
M scripts/
1 file changed, 3 insertions(+), 2 deletions(-)

  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/ b/scripts/
index c90ed2f..6ae8a26 100755
--- a/scripts/
+++ b/scripts/
@@ -11,6 +11,7 @@
 set -x
 DT=$(date +%Y%m%d%H%M)
 TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX)
 # Set FEED and PROJ, based on the FEED env var
@@ -117,7 +118,7 @@
   local gitbpargs=$3
   local repodir=$REPO/$name
   local oscdir=$REPO/osc/$PROJ/$name
-  local dependver="$OSMO_OBS_CONFLICT_PKGVER.$DT"
+  local dependver="$OSMO_OBS_CONFLICT_PKGVER"
   if [ -z "$changelog" ] ; then
@@ -239,7 +240,7 @@
   osmo_obs_checkout_copy debian8 osmo-gsm-manuals
   osmo_obs_checkout_copy debian8 osmo-trx
-  build osmocom-$FEED
+  build osmocom-$FEED no_commit
   build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"
   build osmo-gsm-manuals
   build osmo-gsm-manuals-debian8

To view, visit
To unsubscribe, or for help writing mail filters, visit

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I85f0bcb633c16c7b5a81104f198d9561f53c0c01
Gerrit-Change-Number: 23947
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at>
Gerrit-Reviewer: laforge <laforge at>
Gerrit-Reviewer: osmith <osmith at>
Gerrit-Reviewer: pespin <pespin at>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <>

More information about the gerrit-log mailing list