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

osmith gerrit-no-reply at lists.osmocom.org
Wed Apr 28 16:11:31 UTC 2021


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


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 common-obs-conflict.sh already, and append the date
to the variable.

This is in preparation to add the date to versions of Osmocom
nightly/next packages too, without this change we would have it twice in
the osmocom-$FEED packages.

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



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

diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index c90ed2f..6ae8a26 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -11,6 +11,7 @@
 set -x
 
 DT=$(date +%Y%m%d%H%M)
+OSMO_OBS_CONFLICT_PKGVER="$OSMO_OBS_CONFLICT_PKGVER.$DT"
 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
     changelog=commit
@@ -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 https://gerrit.osmocom.org/c/osmo-ci/+/23947
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I85f0bcb633c16c7b5a81104f198d9561f53c0c01
Gerrit-Change-Number: 23947
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/20210428/f2ceb370/attachment.htm>


More information about the gerrit-log mailing list