<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/24254">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  osmith: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: move verify_feed to common<br><br>Prepare to move the 2021q1 feed from latest to nightly.<br><br>Related: SYS#5370<br>Change-Id: I91e4c36d4a04d465fc9ccb933e8060511b7cd145<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>3 files changed, 21 insertions(+), 19 deletions(-)<br><br></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 34f2549..3a5c0c1 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -280,3 +280,17 @@</span><br><span> </span><br><span>    echo -n "$version"</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Verify that $FEED is in $FEEDS</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_obs_verify_feed() {</span><br><span style="color: hsl(120, 100%, 40%);">+       local i</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     for i in $FEEDS; do</span><br><span style="color: hsl(120, 100%, 40%);">+           if [ "$i" = "$FEED" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                       return</span><br><span style="color: hsl(120, 100%, 40%);">+                fi</span><br><span style="color: hsl(120, 100%, 40%);">+    done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        echo "unsupported feed: $FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+      exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index d942e9d..31fc877 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -24,19 +24,6 @@</span><br><span> DEBSRCDIR="$TOP/debsrc"</span><br><span> FEED="${FEED:-latest}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-verify_feed() {</span><br><span style="color: hsl(0, 100%, 40%);">-  local i</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  for i in $FEEDS; do</span><br><span style="color: hsl(0, 100%, 40%);">-    if [ "$i" = "$FEED" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-      return</span><br><span style="color: hsl(0, 100%, 40%);">-    fi</span><br><span style="color: hsl(0, 100%, 40%);">-  done</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  echo "unsupported feed: $FEED"</span><br><span style="color: hsl(0, 100%, 40%);">-  exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ### OBS build</span><br><span> prepare() {</span><br><span>   # start with a checkout of the project</span><br><span>@@ -259,5 +246,5 @@</span><br><span>   osc ci -m "$FEED versions of $DT" --noservice</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-verify_feed</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_obs_verify_feed</span><br><span> build_osmocom</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index ef2d7ef..62528c2 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,11 @@</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> . "$(dirname "$0")/common-obs.sh"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+FEEDS="</span><br><span style="color: hsl(120, 100%, 40%);">+  next</span><br><span style="color: hsl(120, 100%, 40%);">+  nightly</span><br><span style="color: hsl(120, 100%, 40%);">+"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> set -e</span><br><span> set -x</span><br><span> </span><br><span>@@ -19,11 +24,6 @@</span><br><span> TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX)</span><br><span> FEED="${FEED:-nightly}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if [ "$FEED" != "nightly" ] && [ "$FEED" != "next" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-  echo "unsupported feed: $FEED"</span><br><span style="color: hsl(0, 100%, 40%);">-  exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> ### OBS build</span><br><span> prepare() {</span><br><span>   # clean up the whole space</span><br><span>@@ -269,4 +269,5 @@</span><br><span>   post</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+osmo_obs_verify_feed</span><br><span> build_osmocom</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/24254">change 24254</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/+/24254"/><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: I91e4c36d4a04d465fc9ccb933e8060511b7cd145 </div>
<div style="display:none"> Gerrit-Change-Number: 24254 </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>