Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/11483 )
Change subject: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes
......................................................................
osmo-layer1-headers.sh: Check-out NuRAN branches without slashes
this is an ugly workaround for Jenkins not being able to deal with slash
('/') in label names that comprise the axis of a matrix buildjob, while
nuran not using tags but only branch names in their firmware
repositories :(
Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629
---
M scripts/osmo-layer1-headers.sh
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Harald Welte: Looks good to me, approved; Verified
diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh
index 0adf528..59cad87 100755
--- a/scripts/osmo-layer1-headers.sh
+++ b/scripts/osmo-layer1-headers.sh
@@ -12,18 +12,22 @@
case "$1" in
sysmo)
uri="git://git.sysmocom.de/sysmo-bts/layer1-api"
+ version_prefix=""
version="origin/master"
;;
oct)
uri="git://git.osmocom.org/octphy-2g-headers"
+ version_prefix=""
version="origin/master"
;;
lc15)
uri="https://gitlab.com/nrw_litecell15/litecell15-fw";
+ version_prefix="origin/nrw/"
version="origin/nrw/litecell15"
;;
oc2g)
uri="https://gitlab.com/nrw_oc2g/oc2g-fw";
+ version_prefix="origin/nrw/"
version="origin/nrw/oc2g"
;;
*)
@@ -48,4 +52,7 @@
cd layer1-headers
git fetch origin
-git checkout -f "$version"
+# $version_prefix is an ugly workaround for jenkins not being able to deal
with slash ('/')
+# in label names that comprise the axis of a matrxi buildjob, while nuran not
using tags but
+# only branch names in their firmware repositories :(
+git checkout -f "$version" || git checkout -f "${version_prefix}${version}"
--
To view, visit https://gerrit.osmocom.org/11483
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629
Gerrit-Change-Number: 11483
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
