<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/24256">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: use nightly script to build 2021q1 feed<br><br>Use the nightly script instead of latest, so all packages get<br>upgraded when upgrading osmocom-2021q1.<br><br>Related: SYS#5370<br>Change-Id: If8de585652997aae1edb586c948c181f564f6994<br>---<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>M scripts/osmocom-packages-docker.sh<br>3 files changed, 14 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index c5c19c4..bbdc5a1 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -5,15 +5,14 @@</span><br><span> # * PROJ: the OBS namespace to upload to (e.g. "network:osmocom:latest")</span><br><span> # * FEED:</span><br><span> # * "latest": use latest tagged release (default)</span><br><span style="color: hsl(0, 100%, 40%);">-# * other (e.g. "2021q1"): use last commit of branch of same name, exit with</span><br><span style="color: hsl(0, 100%, 40%);">-# error if it does not exist</span><br><span style="color: hsl(120, 100%, 40%);">+# * other: use last commit of branch of same name, exit with error if it does</span><br><span style="color: hsl(120, 100%, 40%);">+# not exist</span><br><span> # * PACKAGES: set to a space-separated list of packages to skip all others</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> . "$(dirname "$0")/common-obs.sh"</span><br><span> </span><br><span> # Values for FEED env var. Adjust FEEDS_ALL in common-obs when changing.</span><br><span> FEEDS="</span><br><span style="color: hsl(0, 100%, 40%);">- 2021q1</span><br><span> latest</span><br><span> "</span><br><span> </span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index b9a56a3..cd50c7d 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -7,12 +7,15 @@</span><br><span> # * FEED: controls the source branch that is used:</span><br><span> # * "nightly": use "master" branch (default)</span><br><span> # * "next": use "next" branch if it exists, otherwise use "master" branch</span><br><span style="color: hsl(120, 100%, 40%);">+# * other (e.g. "2021q1"): use last commit of branch of same name, exit with</span><br><span style="color: hsl(120, 100%, 40%);">+# error if it does not exist</span><br><span> # * PACKAGES: set to a space-separated list of packages to skip all others</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> . "$(dirname "$0")/common-obs.sh"</span><br><span> </span><br><span> # Values for FEED env var. Adjust FEEDS_ALL in common-obs when changing.</span><br><span> FEEDS="</span><br><span style="color: hsl(120, 100%, 40%);">+ 2021q1</span><br><span> next</span><br><span> nightly</span><br><span> "</span><br><span>@@ -61,6 +64,13 @@</span><br><span> url="$(osmo_git_clone_url "$name")"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -z "$branch" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$FEED" in</span><br><span style="color: hsl(120, 100%, 40%);">+ nightly|next) ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *) branch="$FEED" ;; # e.g. 2021q1</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cd "$REPO"</span><br><span> </span><br><span> if [ -n "$branch" ] ; then</span><br><span>diff --git a/scripts/osmocom-packages-docker.sh b/scripts/osmocom-packages-docker.sh</span><br><span>index 4465d20..a7a804b 100755</span><br><span>--- a/scripts/osmocom-packages-docker.sh</span><br><span>+++ b/scripts/osmocom-packages-docker.sh</span><br><span>@@ -19,8 +19,8 @@</span><br><span> SCRIPT="osmocom-$FEED-packages.sh"</span><br><span> ;;</span><br><span> *)</span><br><span style="color: hsl(0, 100%, 40%);">- # "2021q1" etc, osmocom-latest.sh verifies and uses $FEED</span><br><span style="color: hsl(0, 100%, 40%);">- SCRIPT="osmocom-latest-packages.sh"</span><br><span style="color: hsl(120, 100%, 40%);">+ # "2021q1" etc, osmocom-nightly-packages.sh verifies and uses $FEED</span><br><span style="color: hsl(120, 100%, 40%);">+ SCRIPT="osmocom-nightly-packages.sh"</span><br><span> ;;</span><br><span> esac</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/24256">change 24256</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/+/24256"/><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: If8de585652997aae1edb586c948c181f564f6994 </div>
<div style="display:none"> Gerrit-Change-Number: 24256 </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>