Change in osmo-ci[master]: OBS: next: adjust to push to network:osmocom:next

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/18443 )


Change subject: OBS: next: adjust to push to network:osmocom:next
......................................................................

OBS: next: adjust to push to network:osmocom:next

This repository will have a mix of packages built from master, and from
experimental branches.

Related: SYS#4887
Change-Id: I7274e9c4c889c1d5af9b566b81b0fb8267db08d8
---
M scripts/common-obs.sh
M scripts/osmocom-latest-packages.sh
M scripts/osmocom-next-packages.sh
M scripts/osmocom-nightly-packages.sh
4 files changed, 8 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/18443/1

diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh
index ad62a65..a1603ac 100644
--- a/scripts/common-obs.sh
+++ b/scripts/common-obs.sh
@@ -30,7 +30,7 @@
 osmo_obs_prepare_conflict() {
 	local pkgname="$1"
 	shift 2
-	local pkgver="0.0.0"
+	local pkgver="0.0.1"
 	local oldpwd="$PWD"
 
 	mkdir -p "$pkgname/debian/source"
diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 4d5b3f3..2e19675 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -24,7 +24,7 @@
   mkdir "$DEBSRCDIR"
 
   cd "$TOP"
-  osmo_obs_prepare_conflict "osmocom-latest" "osmocom-nightly"
+  osmo_obs_prepare_conflict "osmocom-latest" "osmocom-nightly" "osmocom-next"
 }
 
 get_last_tag() {
diff --git a/scripts/osmocom-next-packages.sh b/scripts/osmocom-next-packages.sh
index 40f2a6c..6a72769 100755
--- a/scripts/osmocom-next-packages.sh
+++ b/scripts/osmocom-next-packages.sh
@@ -6,10 +6,10 @@
 set -x
 
 # OBS project name
-PROJ=network:osmocom:nightly
+PROJ=network:osmocom:next
 
 DT=$(date +%Y%m%d)
-TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX)
+TOP=$(pwd)/$(mktemp -d next-3g_XXXXXX)
 
 ### OBS build
 prepare() {
@@ -19,7 +19,7 @@
   osc co "$PROJ"
 
   cd "$REPO"
-  osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest"
+  osmo_obs_prepare_conflict "osmocom-next" "osmocom-nightly" "osmocom-latest"
 }
 
 get_last_tag() {
@@ -99,7 +99,7 @@
 
   if [ "$changelog" = "commit" ] ; then
     VER=$(get_commit_version)
-    osmo_obs_add_debian_dependency "./debian/control" "osmocom-nightly"
+    osmo_obs_add_debian_dependency "./debian/control" "osmocom-next"
     dch -b -v "$VER" -m "Snapshot build"
     git commit -m "$VER snapshot" debian/
   fi
@@ -213,7 +213,7 @@
   osmo_obs_checkout_copy debian8 osmo-trx
   osmo_obs_checkout_copy debian10 limesuite
 
-  build osmocom-nightly
+  build osmocom-next
   build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"
   build limesuite-debian10 no_commit --git-upstream-tree="$(get_last_tag limesuite)"
   build osmo-gsm-manuals
diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index 40f2a6c..7b0b3bf 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -19,7 +19,7 @@
   osc co "$PROJ"
 
   cd "$REPO"
-  osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest"
+  osmo_obs_prepare_conflict "osmocom-nightly" "osmocom-latest" "osmocom-next"
 }
 
 get_last_tag() {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/18443
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I7274e9c4c889c1d5af9b566b81b0fb8267db08d8
Gerrit-Change-Number: 18443
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200525/53ef5235/attachment.htm>