Change in pysim[master]: (WIP/CHECK): dump parsed arguments

2018-10-27 Thread Vadim Yanitskiy
Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/11485


Change subject: (WIP/CHECK): dump parsed arguments
..

(WIP/CHECK): dump parsed arguments

Change-Id: I08ddaf2040328aedb714debaf15707279cd7a0e3
---
M pySim-prog.py
M pySim-read.py
2 files changed, 2 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/11485/1

diff --git a/pySim-prog.py b/pySim-prog.py
index 8a17d9d..9a0600f 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -565,6 +565,7 @@

# Parse options
opts = parse_options()
+   print(opts)

# Init card reader driver
if opts.pcsc_dev is not None:
diff --git a/pySim-read.py b/pySim-read.py
index 65184ed..995a477 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -73,6 +73,7 @@

# Parse options
opts = parse_options()
+   print(opts)

# Init card reader driver
if opts.pcsc_dev is not None:

--
To view, visit https://gerrit.osmocom.org/11485
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08ddaf2040328aedb714debaf15707279cd7a0e3
Gerrit-Change-Number: 11485
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy 


Change in pysim[master]: pySim/transport: introduce Calypso based reader interface

2018-10-27 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11480 )

Change subject: pySim/transport: introduce Calypso based reader interface
..


Patch Set 2:

> another way to go about this would be to implement a pc/sc
 > ifd_handler for L1CTL, this way it would just show up as a normal
 > reader in pcsc_scan.

Yep, I am going to implement a L23 application for that, but later.
I have no PC/SC SIM-card reader ATM, but there was a need to program one.
Probably, this "hack" would be useful for someone else...


--
To view, visit https://gerrit.osmocom.org/11480
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b
Gerrit-Change-Number: 11480
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Sat, 27 Oct 2018 17:07:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Build failed in Jenkins: master-asn1c ยป a1=default,a2=default,a3=default,osmocom-master-debian9 #289

2018-10-27 Thread jenkins
See 


--
[...truncated 3.67 KB...]

+ ./configure
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognise dependent libraries... pass_all
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... gcc3
checking how to run the C++ preprocessor... g++ -E
checking for g77... no
checking for f77... no
checking for xlf... no
checking for frt... no
checking for pgf77... no
checking for cf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for f90... no
checking for xlf90... no
checking for pgf90... no
checking for pghpf... no
checking for epcf90... no
checking for gfortran... no
checking for g95... no
checking for f95... no
checking for fort... no
checking for xlf95... no
checking for ifort... no
checking for ifc... no
checking for efc... no
checking for pgf95... no
checking for lf95... no
checking for ftn... no
checking whether we are using the GNU Fortran 77 compiler... no
checking whether  accepts -g... no
checking the maximum length of command line arguments... 32768
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for objdir... .libs
checking for ar... ar
checking for ranlib... ranlib
checking for strip... strip
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC
checking if gcc PIC flag -fPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
configure: creating libtool
appending configuration tag "CXX" to libtool
checking for ld used by g++... /usr/bin/ld -m elf_x86_64
checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking for g++ option to produce PIC... -fPIC
checking if g++ PIC flag -fPIC works... yes
checking if g++ static flag -static works... yes
checking if g++ supports -c -o file.o... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
appending configuration tag "F77" to libtool
checking for autoconf... /usr/bin/autoconf
checking for autoheader... /usr/bin/autoheader
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dep

Change in osmo-bts[master]: Add OC-2G BTS sources

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11447 )

Change subject: Add OC-2G BTS sources
..


Patch Set 5: Code-Review+2

> Thanks for the review Harald. I've squashed the changes as
 > requested and have also added oc2g as a target to jenkins_bts_model
 > which I have verified as passing. However, it hasn't shown up in
 > jenkins (I think we need to add the target configuration)

Yes, that's sort of a chicken-and-egg problem.  we have to  ask jenkins to 
verify oc-2g before it is merged, yet a the same time it cannot be verified 
until it's merged.  That requires some manual actions on tight timeline.  It's 
done now and OC-2G support passes against both "oc2g" as well as "oc2g-next" 
firmware/phy from nuran.


--
To view, visit https://gerrit.osmocom.org/11447
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35
Gerrit-Change-Number: 11447
Gerrit-PatchSet: 5
Gerrit-Owner: Omar Ramadan 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Omar Ramadan 
Gerrit-Comment-Date: Sat, 27 Oct 2018 11:54:36 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-bts[master]: Add OC-2G BTS sources

2018-10-27 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11447 )

Change subject: Add OC-2G BTS sources
..

Add OC-2G BTS sources

Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35
---
M configure.ac
M contrib/jenkins_bts_model.sh
A contrib/jenkins_oc2g.sh
A contrib/systemd/oc2gbts-mgr.service
A contrib/systemd/osmo-bts-oc2g.service
A doc/examples/oc2g/oc2gbts-mgr.cfg
A doc/examples/oc2g/osmo-bts.cfg
M include/osmo-bts/gsm_data_shared.h
M include/osmo-bts/phy_link.h
M src/Makefile.am
M src/common/gsm_data_shared.c
A src/osmo-bts-oc2g/Makefile.am
A src/osmo-bts-oc2g/calib_file.c
A src/osmo-bts-oc2g/hw_info.ver_major
A src/osmo-bts-oc2g/hw_misc.c
A src/osmo-bts-oc2g/hw_misc.h
A src/osmo-bts-oc2g/l1_if.c
A src/osmo-bts-oc2g/l1_if.h
A src/osmo-bts-oc2g/l1_transp.h
A src/osmo-bts-oc2g/l1_transp_hw.c
A src/osmo-bts-oc2g/main.c
A src/osmo-bts-oc2g/misc/oc2gbts_bid.c
A src/osmo-bts-oc2g/misc/oc2gbts_bid.h
A src/osmo-bts-oc2g/misc/oc2gbts_bts.c
A src/osmo-bts-oc2g/misc/oc2gbts_bts.h
A src/osmo-bts-oc2g/misc/oc2gbts_clock.c
A src/osmo-bts-oc2g/misc/oc2gbts_clock.h
A src/osmo-bts-oc2g/misc/oc2gbts_led.c
A src/osmo-bts-oc2g/misc/oc2gbts_led.h
A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c
A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h
A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c
A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c
A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c
A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c
A src/osmo-bts-oc2g/misc/oc2gbts_misc.c
A src/osmo-bts-oc2g/misc/oc2gbts_misc.h
A src/osmo-bts-oc2g/misc/oc2gbts_nl.c
A src/osmo-bts-oc2g/misc/oc2gbts_nl.h
A src/osmo-bts-oc2g/misc/oc2gbts_par.c
A src/osmo-bts-oc2g/misc/oc2gbts_par.h
A src/osmo-bts-oc2g/misc/oc2gbts_power.c
A src/osmo-bts-oc2g/misc/oc2gbts_power.h
A src/osmo-bts-oc2g/misc/oc2gbts_swd.c
A src/osmo-bts-oc2g/misc/oc2gbts_swd.h
A src/osmo-bts-oc2g/misc/oc2gbts_temp.c
A src/osmo-bts-oc2g/misc/oc2gbts_temp.h
A src/osmo-bts-oc2g/misc/oc2gbts_util.c
A src/osmo-bts-oc2g/oc2gbts.c
A src/osmo-bts-oc2g/oc2gbts.h
A src/osmo-bts-oc2g/oc2gbts_vty.c
A src/osmo-bts-oc2g/oml.c
A src/osmo-bts-oc2g/oml_router.c
A src/osmo-bts-oc2g/oml_router.h
A src/osmo-bts-oc2g/tch.c
A src/osmo-bts-oc2g/utils.c
A src/osmo-bts-oc2g/utils.h
57 files changed, 13,546 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved




--
To view, visit https://gerrit.osmocom.org/11447
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35
Gerrit-Change-Number: 11447
Gerrit-PatchSet: 5
Gerrit-Owner: Omar Ramadan 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Omar Ramadan 


Change in osmo-ci[master]: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11484 )

Change subject: gerrot-osmo-bts: Don't use unsupported '/' in labels of 
axis/matrix jobs
..


Patch Set 1: Verified+1 Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11484
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666
Gerrit-Change-Number: 11484
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Sat, 27 Oct 2018 11:42:34 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in pysim[master]: pySim/transport: introduce Calypso based reader interface

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11480 )

Change subject: pySim/transport: introduce Calypso based reader interface
..


Patch Set 2:

another way to go about this would be to implement a pc/sc ifd_handler for 
L1CTL, this way it would just show up as a normal reader in pcsc_scan.


--
To view, visit https://gerrit.osmocom.org/11480
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b
Gerrit-Change-Number: 11480
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Sat, 27 Oct 2018 11:41:46 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in pysim[master]: pySim/transport: introduce Calypso based reader interface

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11480 )

Change subject: pySim/transport: introduce Calypso based reader interface
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11480
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b
Gerrit-Change-Number: 11480
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Sat, 27 Oct 2018 11:40:37 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in pysim[master]: pySim-*.py: refactor card reader driver initialization

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11481 )

Change subject: pySim-*.py: refactor card reader driver initialization
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/11481
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97
Gerrit-Change-Number: 11481
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Sat, 27 Oct 2018 11:40:48 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ci[master]: gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs

2018-10-27 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
https://gerrit.osmocom.org/11484


Change subject: gerrot-osmo-bts: Don't use unsupported '/' in labels of 
axis/matrix jobs
..

gerrot-osmo-bts: Don't use unsupported '/' in labels of axis/matrix jobs

It seems jenkins cannot deal with this, so we cannot specify something
like 'origin/nrw/oc2g-next' in a label.  Let's work around by using only
oc2g-next here and expanding that to 'origin/nrw/oc2g-next' only in the
osmo-l1yer1-headers.sh script of osmo-ci.git

Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666
---
M jobs/gerrit-verifications.yml
1 file changed, 4 insertions(+), 4 deletions(-)



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

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a989760..71a0904 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -87,7 +87,7 @@

   - osmo-bts:
   a1_name: FIRMWARE_VERSION
-  a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, 
superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, 
origin/nrw/litecell15, origin/nrw/oc2g, origin/nrw/oc2g-next]
+  a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, 
superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, 
oc2g, oc2g-next]
   a2_name: BTS_MODEL
   a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g]
   combination_filter: >
@@ -98,9 +98,9 @@
 (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") ||
 (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") ||
 (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") ||
-(FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == 
"lc15") ||
-(FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") ||
-(FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g")
+(FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") ||
+(FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") ||
+(FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g")
   cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'

   - osmo-ggsn:

--
To view, visit https://gerrit.osmocom.org/11484
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9130a2f349f06a0b46b50665cef7188ddb08f666
Gerrit-Change-Number: 11484
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in osmo-ci[master]: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes

2018-10-27 Thread Harald Welte
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 
Gerrit-Reviewer: Harald Welte 


Change in osmo-ci[master]: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11483 )

Change subject: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes
..


Patch Set 1: Verified+1 Code-Review+2


--
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: comment
Gerrit-Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629
Gerrit-Change-Number: 11483
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Sat, 27 Oct 2018 11:34:36 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ci[master]: osmo-layer1-headers.sh: Check-out NuRAN branches without slashes

2018-10-27 Thread Harald Welte
Harald Welte has uploaded this change for review. ( 
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(-)



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

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: newchange
Gerrit-Change-Id: I1bbfc61f66c5fc490ceca96a8eb21210dd89b629
Gerrit-Change-Number: 11483
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 


Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11470 )

Change subject: gerrit-verifications.yml: Add OC2G build matrix to 
gerrit-osmo-bts
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11470
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76
Gerrit-Change-Number: 11470
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Omar Ramadan 
Gerrit-Comment-Date: Sat, 27 Oct 2018 10:22:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts

2018-10-27 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11470 )

Change subject: gerrit-verifications.yml: Add OC2G build matrix to 
gerrit-osmo-bts
..

gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts

The gerrit-osmo-bts job is used for build verification of osmo-bts
patches.  This adds (untested) support for OC2G

Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76
---
M jobs/gerrit-verifications.yml
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Omar Ramadan: Looks good to me, but someone else must approve; Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index f3bde2e..a989760 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -87,9 +87,9 @@

   - osmo-bts:
   a1_name: FIRMWARE_VERSION
-  a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, 
superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, 
origin/nrw/litecell15]
+  a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, 
superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, 
origin/nrw/litecell15, origin/nrw/oc2g, origin/nrw/oc2g-next]
   a2_name: BTS_MODEL
-  a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15]
+  a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g]
   combination_filter: >
 FIRMWARE_VERSION == "master" ||
 (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") ||
@@ -98,7 +98,9 @@
 (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") ||
 (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") ||
 (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") ||
-(FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == 
"lc15")
+(FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == 
"lc15") ||
+(FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g") ||
+(FIRMWARE_VERSION == "origin/nrw/oc2g-next" && BTS_MODEL == "oc2g")
   cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"'

   - osmo-ggsn:

--
To view, visit https://gerrit.osmocom.org/11470
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: I62a9a5ec357b7246b2d7915681c646c79eda4b76
Gerrit-Change-Number: 11470
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Omar Ramadan 


Change in osmo-ci[master]: gerrit-verifications.yml: Add OC2G build matrix to gerrit-osmo-bts

2018-10-27 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11470 )

Change subject: gerrit-verifications.yml: Add OC2G build matrix to 
gerrit-osmo-bts
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/11470
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I62a9a5ec357b7246b2d7915681c646c79eda4b76
Gerrit-Change-Number: 11470
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Omar Ramadan 
Gerrit-Comment-Date: Sat, 27 Oct 2018 10:22:51 +
Gerrit-HasComments: No
Gerrit-HasLabels: No