<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23951">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: latest: support new 2021q1 feed<br><br>Related: SYS#5370<br>Change-Id: I7a59a6ad94b21ba397349813b56b9bd5ea01c7c3<br>---<br>M scripts/osmocom-latest-packages.sh<br>1 file changed, 54 insertions(+), 10 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/51/23951/1</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 fd89471..767d866 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -3,15 +3,38 @@</span><br><span> # New packages are only uploaded if the source changed.</span><br><span> # Environment variables:</span><br><span> # * PROJ: the OBS namespace to upload to (e.g. network:osmocom:latest)</span><br><span style="color: hsl(120, 100%, 40%);">+# * FEED:</span><br><span style="color: hsl(120, 100%, 40%);">+# * "latest": use latest tagged release (default)</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> . "$(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%);">+ 2021q1</span><br><span style="color: hsl(120, 100%, 40%);">+ latest</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> DT=$(date +%Y%m%d%H%M)</span><br><span> TOP=$(pwd)</span><br><span> DEBSRCDIR="$TOP/debsrc"</span><br><span style="color: hsl(120, 100%, 40%);">+FEED="${FEED:-latest}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+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> </span><br><span> ### OBS build</span><br><span> prepare() {</span><br><span>@@ -25,7 +48,15 @@</span><br><span> mkdir "$DEBSRCDIR"</span><br><span> </span><br><span> cd "$TOP"</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_prepare_conflict "osmocom-latest" "osmocom-nightly" "osmocom-next"</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ local conflict_args="osmocom-nightly osmocom-next"</span><br><span style="color: hsl(120, 100%, 40%);">+ local i</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%);">+ conflict_args="$conflict_args osmocom-$i"</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%);">+ osmo_obs_prepare_conflict "osmocom-$FEED" $conflict_args</span><br><span> }</span><br><span> </span><br><span> get_last_tag() {</span><br><span>@@ -54,8 +85,14 @@</span><br><span> [ -d "$project" ] || osmo_git_clone_date "$url" "$project"</span><br><span> cd "$project"</span><br><span> git fetch</span><br><span style="color: hsl(0, 100%, 40%);">- VER=$(get_last_tag "$project")</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout -f -B "$VER" "refs/tags/$VER"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$FEED" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ VER=$(get_last_tag "$project")</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B "$VER" "refs/tags/$VER"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ git checkout -f -B "$FEED" "origin/$FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if [ "$project" = "open5gs" ]; then</span><br><span> meson subprojects download freeDiameter</span><br><span> fi</span><br><span>@@ -68,12 +105,18 @@</span><br><span> echo</span><br><span> echo "====> Building $project"</span><br><span> cd "$TOP/$project"</span><br><span style="color: hsl(0, 100%, 40%);">- VER=$(get_last_tag "$project")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$FEED" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ debian_branch=$(get_last_tag "$project")</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ debian_branch="$FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if [ -x ./git-version-gen ]; then</span><br><span> ./git-version-gen . > .tarball-version 2>/dev/null</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_depend_deb "./debian/control" "$project" "osmocom-latest"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_depend_deb "./debian/control" "$project" "osmocom-$FEED"</span><br><span> </span><br><span> if [ "$project" = "open5gs" ]; then</span><br><span> # we cannot control the output directory of the generated source :(</span><br><span>@@ -82,11 +125,11 @@</span><br><span> mv "../$name"*.tar* "../$name"*.dsc "$output"</span><br><span> elif [ -x ./git-version-gen ]; then</span><br><span> gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \</span><br><span style="color: hsl(0, 100%, 40%);">- "--git-debian-branch=$VER" --git-ignore-new $gitbpargs \</span><br><span style="color: hsl(120, 100%, 40%);">+ "--git-debian-branch=$debian_branch" --git-ignore-new $gitbpargs \</span><br><span> --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/'</span><br><span> else</span><br><span> gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \</span><br><span style="color: hsl(0, 100%, 40%);">- "--git-debian-branch=$VER" --git-ignore-new $gitbpargs</span><br><span style="color: hsl(120, 100%, 40%);">+ "--git-debian-branch=$debian_branch" --git-ignore-new $gitbpargs</span><br><span> fi</span><br><span> </span><br><span> if [ ! -d "$TOP/$PROJ/$project" ] ; then</span><br><span>@@ -109,7 +152,7 @@</span><br><span> fi</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$TOP/$project" "$project" "osmocom-latest"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$TOP/$project" "$project" "osmocom-$FEED"</span><br><span> </span><br><span> cd "$TOP"</span><br><span> }</span><br><span>@@ -159,7 +202,7 @@</span><br><span> cd "$TOP"</span><br><span> osmo_obs_checkout_copy debian8 osmo-gsm-manuals</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- build osmocom-latest</span><br><span style="color: hsl(120, 100%, 40%);">+ build osmocom-$FEED</span><br><span> build limesuite --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span> build osmo-gsm-manuals</span><br><span> build osmo-gsm-manuals-debian8</span><br><span>@@ -196,7 +239,8 @@</span><br><span> build osmo-gbproxy</span><br><span> </span><br><span> cd "$TOP/$PROJ"</span><br><span style="color: hsl(0, 100%, 40%);">- osc ci -m "Latest Tagged versions of $DT" --noservice</span><br><span style="color: hsl(120, 100%, 40%);">+ osc ci -m "$FEED versions of $DT" --noservice</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+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/+/23951">change 23951</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/+/23951"/><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: I7a59a6ad94b21ba397349813b56b9bd5ea01c7c3 </div>
<div style="display:none"> Gerrit-Change-Number: 23951 </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>