<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/18443">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: next: adjust to push to network:osmocom:next<br><br>This repository will have a mix of packages built from master, and from<br>experimental branches.<br><br>Related: SYS#4887<br>Change-Id: I7274e9c4c889c1d5af9b566b81b0fb8267db08d8<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-next-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>4 files changed, 8 insertions(+), 8 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/43/18443/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 ad62a65..a1603ac 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -30,7 +30,7 @@</span><br><span> osmo_obs_prepare_conflict() {</span><br><span> local pkgname="$1"</span><br><span> shift 2</span><br><span style="color: hsl(0, 100%, 40%);">- local pkgver="0.0.0"</span><br><span style="color: hsl(120, 100%, 40%);">+ local pkgver="0.0.1"</span><br><span> local oldpwd="$PWD"</span><br><span> </span><br><span> mkdir -p "$pkgname/debian/source"</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 4d5b3f3..2e19675 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -24,7 +24,7 @@</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"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_prepare_conflict "osmocom-latest" "osmocom-nightly" "osmocom-next"</span><br><span> }</span><br><span> </span><br><span> get_last_tag() {</span><br><span>diff --git a/scripts/osmocom-next-packages.sh b/scripts/osmocom-next-packages.sh</span><br><span>index 40f2a6c..6a72769 100755</span><br><span>--- a/scripts/osmocom-next-packages.sh</span><br><span>+++ b/scripts/osmocom-next-packages.sh</span><br><span>@@ -6,10 +6,10 @@</span><br><span> set -x</span><br><span> </span><br><span> # OBS project name</span><br><span style="color: hsl(0, 100%, 40%);">-PROJ=network:osmocom:nightly</span><br><span style="color: hsl(120, 100%, 40%);">+PROJ=network:osmocom:next</span><br><span> </span><br><span> DT=$(date +%Y%m%d)</span><br><span style="color: hsl(0, 100%, 40%);">-TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX)</span><br><span style="color: hsl(120, 100%, 40%);">+TOP=$(pwd)/$(mktemp -d next-3g_XXXXXX)</span><br><span> </span><br><span> ### OBS build</span><br><span> prepare() {</span><br><span>@@ -19,7 +19,7 @@</span><br><span> osc co "$PROJ"</span><br><span> </span><br><span> cd "$REPO"</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_prepare_conflict "osmocom-next" "osmocom-nightly" "osmocom-latest"</span><br><span> }</span><br><span> </span><br><span> get_last_tag() {</span><br><span>@@ -99,7 +99,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_debian_dependency "./debian/control" "osmocom-nightly"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_debian_dependency "./debian/control" "osmocom-next"</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>@@ -213,7 +213,7 @@</span><br><span> osmo_obs_checkout_copy debian8 osmo-trx</span><br><span> osmo_obs_checkout_copy debian10 limesuite</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- build osmocom-nightly</span><br><span style="color: hsl(120, 100%, 40%);">+ build osmocom-next</span><br><span> build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span> build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span> build osmo-gsm-manuals</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index 40f2a6c..7b0b3bf 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -19,7 +19,7 @@</span><br><span> osc co "$PROJ"</span><br><span> </span><br><span> cd "$REPO"</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest" "osmocom-next"</span><br><span> }</span><br><span> </span><br><span> get_last_tag() {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/18443">change 18443</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/+/18443"/><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: I7274e9c4c889c1d5af9b566b81b0fb8267db08d8 </div>
<div style="display:none"> Gerrit-Change-Number: 18443 </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>