<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22223">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: nightly: depend on dummy pkg of current date<br><br>Make it impossible to mix nightly/next builds of different dates.<br><br>Related: OS#4733<br>Change-Id: Ida8db8e6c91834c9d9e43694d9b4daea55a2f8f8<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-nightly-packages.sh<br>2 files changed, 18 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/23/22223/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh</span><br><span>index adfa076..40cacf2 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -20,16 +20,22 @@</span><br><span> # $1: path to debian/control file</span><br><span> # $2: package name (e.g. "libosmocore")</span><br><span> # $3: dependency package name (e.g. "osmocom-nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+# $4: dependency package version (optional, e.g. "1.0.0.202101151122")</span><br><span> osmo_obs_add_depend_deb() {</span><br><span>       local d_control="$1"</span><br><span>       local pkgname="$2"</span><br><span>         local depend="$3"</span><br><span style="color: hsl(120, 100%, 40%);">+   local dependver="$4"</span><br><span> </span><br><span>   if [ "$pkgname" = "$depend" ]; then</span><br><span>              echo "NOTE: skipping dependency on itself: $depend"</span><br><span>                return</span><br><span>       fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if [ -n "$dependver" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                depend="$depend (= $dependver)"</span><br><span style="color: hsl(120, 100%, 40%);">+     fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         # Note: adding the comma at the end should be fine. If there is a Depends: line, it is most likely not empty. It</span><br><span>     # should at least have ${misc:Depends} according to lintian.</span><br><span>         sed "s/^Depends: /Depends: $depend, /g" -i "$d_control"</span><br><span>@@ -41,16 +47,22 @@</span><br><span> # $1: path to rpm spec file</span><br><span> # $2: package name (e.g. "libosmocore")</span><br><span> # $3: dependency package name (e.g. "osmocom-nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+# $4: dependency package version (optional, e.g. "1.0.0.202101151122")</span><br><span> osmo_obs_add_depend_rpm() {</span><br><span>   local spec="$1"</span><br><span>    local pkgname="$2"</span><br><span>         local depend="$3"</span><br><span style="color: hsl(120, 100%, 40%);">+   local dependver="$4"</span><br><span> </span><br><span>   if [ "$pkgname" = "$depend" ]; then</span><br><span>              echo "NOTE: skipping dependency on itself: $depend"</span><br><span>                return</span><br><span>       fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if [ -n "$dependver" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                depend="$depend = $dependver"</span><br><span style="color: hsl(120, 100%, 40%);">+       fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         ( while IFS= read -r line; do</span><br><span>                echo "$line"</span><br><span> </span><br><span>@@ -75,11 +87,13 @@</span><br><span> # $2: repodir (path to git repository)</span><br><span> # $3: package name (e.g. "libosmocore")</span><br><span> # $4: dependency package name (e.g. "osmocom-nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+# $5: dependency package version (optional, e.g. "1.0.0.202101151122")</span><br><span> osmo_obs_add_rpm_spec() {</span><br><span>   local oscdir="$1"</span><br><span>  local repodir="$2"</span><br><span>         local name="$3"</span><br><span>    local depend="$4"</span><br><span style="color: hsl(120, 100%, 40%);">+   local dependver="$5"</span><br><span>       local spec_in="$(find "$repodir" -name "$name.spec.in")"</span><br><span>       local spec="$oscdir/$name.spec"</span><br><span>    local tarball</span><br><span>@@ -92,7 +106,7 @@</span><br><span> </span><br><span>       cp "$spec_in" "$spec"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_obs_add_depend_rpm "$spec" "$name" "$depend"</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_obs_add_depend_rpm "$spec" "$name" "$depend" "$dependver"</span><br><span> </span><br><span>   # Set version</span><br><span>        version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)"</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index ced0998..a6340d1 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -109,6 +109,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(120, 100%, 40%);">+  local dependver="$OSMO_OBS_CONFLICT_PKGVER.$DT"</span><br><span> </span><br><span>   if [ -z "$changelog" ] ; then</span><br><span>     changelog=commit</span><br><span>@@ -129,7 +130,7 @@</span><br><span> </span><br><span>   if [ "$changelog" = "commit" ] ; then</span><br><span>     VER=$(get_commit_version)</span><br><span style="color: hsl(0, 100%, 40%);">-    osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED" "$dependver"</span><br><span>     dch -b -v "$VER" -m "Snapshot build"</span><br><span>     git commit -m "$VER snapshot" debian/</span><br><span>   fi</span><br><span>@@ -152,7 +153,7 @@</span><br><span> </span><br><span>   cd "$oscdir"</span><br><span>   osc add -- *.tar* *.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" "osmocom-$FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" "osmocom-$FEED" "$dependver"</span><br><span>   osc ci -m "Snapshot $name $DT" --noservice</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22223">change 22223</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/+/22223"/><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: Ida8db8e6c91834c9d9e43694d9b4daea55a2f8f8 </div>
<div style="display:none"> Gerrit-Change-Number: 22223 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>