Change in docker-playground[master]: make/Makefile: fix recursive 'PULL' error
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13512 Change subject: make/Makefile: fix recursive 'PULL' error .. make/Makefile: fix recursive 'PULL' error Don't abort with the following error, when running 'make' without setting the PULL environment variable: ../make/Makefile:20: *** Recursive variable 'PULL' references itself (eventually). Stop. This fixes a regression from Change-Id I1076bbb7d77bdc99f5d60d641c09ce965fb9dfc6. Related: OS#3869 Change-Id: I4b4772e9ed6e07ab00943154265c9cbdea22a2f5 --- M make/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/13512/1 diff --git a/make/Makefile b/make/Makefile index d4e3c22..7dfa795 100644 --- a/make/Makefile +++ b/make/Makefile @@ -17,7 +17,7 @@ USERNAME?=$(USER) NAME?=$(shell basename $(CURDIR)) OSMO_TTCN3_BRANCH?=master -PULL?=$(PULL) +PULL?= RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST/.make-release-support IMAGE?=$(REGISTRY_HOST)/$(USER)/$(NAME) -- To view, visit https://gerrit.osmocom.org/13512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b4772e9ed6e07ab00943154265c9cbdea22a2f5 Gerrit-Change-Number: 13512 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in libosmocore[master]: Add code coverage support
Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 2: > Patch Set 2: > > > To resolve this in a more portable way I could copy the latest > > version of this macro in libosmocore's m4 directory. Would this be > > OK? > > In theory yes, but the problem is that we'd have to add this to each and > every osmocom project. I was hoping for something that avoids lots of > copy+pasting. Maybe we can install the m4 file from libosmocore and use it > from all other projects, similar to our "make release" helper? I'm going to research this and post a new patch, don't merge this for now. -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Wed, 03 Apr 2019 22:24:20 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: make all library-internal static buffers thread-local
Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13436 to look at the new patch set (#5). Change subject: make all library-internal static buffers thread-local .. make all library-internal static buffers thread-local We have a number of library-internal static global buffers which are mainly used for various stringification functions. This worked as all of the related Osmocom programs were strictly single-threaded. Let's make those buffers at least thread-local. This way every thread gets their own set of buffers, and it's safe for multiple threads to execute the same functiosn once. They're of course still not re-entrant. If you need re-entrancy, you will need to use the _c() or _buf() suffix versionf of those functions and work with your own (stack or heap) buffers. Change-Id: I50eb2436a7c1261d79a9d2955584dce92780ca07 --- M src/fsm.c M src/gb/gprs_ns.c M src/gsm/abis_nm.c M src/gsm/apn.c M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/gsm48.c M src/gsm/gsm_utils.c M src/gsm/rsl.c M src/msgb.c M src/sim/core.c M src/socket.c M src/utils.c 13 files changed, 32 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/13436/5 -- To view, visit https://gerrit.osmocom.org/13436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I50eb2436a7c1261d79a9d2955584dce92780ca07 Gerrit-Change-Number: 13436 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy
Change in libosmocore[master]: Add code coverage support
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Comment-Date: Wed, 03 Apr 2019 19:23:27 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: Add code coverage support
Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 2: (2 comments) I took the previous version of ax_code_coverage.m4 from autoconf-archive v2018.03.13 as the latest version from v2019.01.06 depends on other macros and I've to add them all to not introduce dependency to autoconf-archive. I've tried this but was not able to compile it in debian jessie and ubuntu trusty without installing autoconf-archive. The version from v2018.03.13 does not depend on other macros and I've been able to compile it without the full autoconf-archive. https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG@7 PS1, Line 7: Add code coverage support > I guess everyone knows what "coverage" means in terms of software > development/testing. […] Done https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG@10 PS1, Line 10: could be tracked over tim > would be great to specify where that report is placed (path/filename). Done -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 19:14:08 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in libosmocore[master]: Add code coverage support
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 2: > To resolve this in a more portable way I could copy the latest > version of this macro in libosmocore's m4 directory. Would this be > OK? In theory yes, but the problem is that we'd have to add this to each and every osmocom project. I was hoping for something that avoids lots of copy+pasting. Maybe we can install the m4 file from libosmocore and use it from all other projects, similar to our "make release" helper? -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 19:09:34 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: Add code coverage support
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13496 to look at the new patch set (#2). Change subject: Add code coverage support .. Add code coverage support The coverage report shows what code is covered by tests and what is not and the ratio could be tracked over time. These reports will allow us to identify code that is not being tested and improve the test suites. To enable the reports configure with --enable-code-coverage and execute "make check-code-coverage". The HTML report will be generated in a subdirectory with name libosmocore-$(PACKAGE_VERSION)-coverage/index.html The report is generated using gcov and lcov tools and the AX_CODE_COVERAGE macro from the autoconf-archive project. The ax_code_coverage.m4 was taken from autoconf-archive v2018.03.13 Closes: OS#1987 Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c --- M .gitignore M Makefile.am M configure.ac A m4/ax_code_coverage.m4 M src/Makefile.am M src/codec/Makefile.am M src/coding/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/pseudotalloc/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 13 files changed, 310 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/13496/2 -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy
Change in libosmocore[master]: make all library-internal static buffers thread-local
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13436 ) Change subject: make all library-internal static buffers thread-local .. Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/13436/4/src/utils.c File src/utils.c: https://gerrit.osmocom.org/#/c/13436/4/src/utils.c@493 PS4, Line 493: static uint8_t buf[sizeof(uint64_t)]; What about this one? ;) This is the only one I could find using: git grep "static uint". -- To view, visit https://gerrit.osmocom.org/13436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I50eb2436a7c1261d79a9d2955584dce92780ca07 Gerrit-Change-Number: 13436 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 17:52:04 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in libosmocore[master]: Add _buf() functions to bypass static string buffers
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13310 ) Change subject: Add _buf() functions to bypass static string buffers .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf85f79e93244f53b2684ff6f1095c5b41203e05 Gerrit-Change-Number: 13310 Gerrit-PatchSet: 9 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Apr 2019 17:01:19 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmocore[master]: make use of OTC_GLOBAL when allocating library-internal contexts
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13338 ) Change subject: make use of OTC_GLOBAL when allocating library-internal contexts .. Patch Set 5: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/13338/5/src/gsm/lapd_core.c File src/gsm/lapd_core.c: https://gerrit.osmocom.org/#/c/13338/5/src/gsm/lapd_core.c@255 PS5, Line 255: __thread Looks like it should have been done in https://gerrit.osmocom.org/#/c/libosmocore/+/13436/. https://gerrit.osmocom.org/#/c/13338/5/src/logging.c File src/logging.c: https://gerrit.osmocom.org/#/c/13338/5/src/logging.c@962 PS5, Line 962: ctx Should we mark it as '__unused' then? -- To view, visit https://gerrit.osmocom.org/13338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48f475efd3ee0d5120b8fc30861e852d1a6920b1 Gerrit-Change-Number: 13338 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 16:37:06 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-ci[master]: ansible: osmo-gsm-tester: Make modem net ifaces persistent
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/13495 )
Change subject: ansible: osmo-gsm-tester: Make modem net ifaces persistent
..
ansible: osmo-gsm-tester: Make modem net ifaces persistent
Currently ofono doesn't catch network interface renaming (takes the name
at ofono startup time).
If a modem crashes, its net iface is unregistered and registered again,
and it can happen that the new name is not the same as before (for
instance, wwan8->wwan0 if wwan0 is located on another netns).
These udev rules allow creating persistent unique names to prevent modem
crashes resulting on interface name changing.
dhcpcd is known to race against udev when managing dev interfaces,
bringing them up before udev sometimes, and then udev is unable to
rename it. By denying dhcpcd from managing modem ifaces (ww* and r*
according to kernel/our rules), we get rid of this issue.
Related: OS#3881
Change-Id: Ic3ef75285aa84f9aa606562cd2f6166de186c1a6
---
A ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
M ansible/roles/gsm-tester/tasks/main.yml
2 files changed, 22 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Pau Espin Pedrol: Verified
diff --git a/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
b/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
new file mode 100644
index 000..a9826e2
--- /dev/null
+++ b/ansible/roles/gsm-tester/files/70-net-setup-link-modems.rules
@@ -0,0 +1,10 @@
+SUBSYSTEM!="net", GOTO="net_setup_link_end"
+ACTION!="add", GOTO="net_setup_link_end"
+
+IMPORT{builtin}="net_id"
+
+# If dev paths are too long (too many usb hubs in the path) (>IFNAMSIZ),
ID_NET_NAME_PATH is not populated.
+ENV{DEVTYPE}=="wwan", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
+ENV{DEVTYPE}=="wwan", ENV{ID_NET_NAME_PATH}=="", PROGRAM="/bin/sh -ec 'echo
${DEVPATH} | sha1sum | head -c14'", NAME="r$result"
+
+LABEL="net_setup_link_end"
diff --git a/ansible/roles/gsm-tester/tasks/main.yml
b/ansible/roles/gsm-tester/tasks/main.yml
index 8a854bd..c9b7429 100644
--- a/ansible/roles/gsm-tester/tasks/main.yml
+++ b/ansible/roles/gsm-tester/tasks/main.yml
@@ -274,3 +274,15 @@
src: 64-limesuite.rules
dest: /etc/udev/rules.d/
notify: restart udev
+
+- name: use persistent naming for modem network interfaces
+ copy:
+src: 70-net-setup-link-modems.rules
+dest: /etc/udev/rules.d/
+ notify: restart udev
+
+- name: avoid dhcpcd managing modem interfaces and racing with udev rename
+ lineinfile:
+path: /etc/dhcpcd.conf
+regexp: '^denyinterfaces'
+line: 'denyinterfaces ww* r*'
--
To view, visit https://gerrit.osmocom.org/13495
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: Ic3ef75285aa84f9aa606562cd2f6166de186c1a6
Gerrit-Change-Number: 13495
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-ci[master]: ansible: osmo-gsm-tester: Make modem net ifaces persistent
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13495 ) Change subject: ansible: osmo-gsm-tester: Make modem net ifaces persistent .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/13495 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: Ic3ef75285aa84f9aa606562cd2f6166de186c1a6 Gerrit-Change-Number: 13495 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Apr 2019 16:06:19 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-gsm-tester[master]: process: Prevent NetNSProcess alive forever after SIGKILL
Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/13511
Change subject: process: Prevent NetNSProcess alive forever after SIGKILL
..
process: Prevent NetNSProcess alive forever after SIGKILL
NetNSProcess are run in the following process tree:
osmo-gsm-tester -> sudo -> bash (osmo-gsm-tester_netns_exec.sh) ->
tcpdump.
Lots of osmo-gsm-tester_netns_exec.sh scripts with tcpdump child process
were spotted in prod setup of osmo-gsm-tester. Apparently that happens
because sometimes tcpdump doesn't get killed in time with SIGTERM and
SIGINT, and as a result SIGKILL is sent by osmo-gsm-tester as usual
termination procedure. When SIGKILL is sent, the parent sudo process is
instantly killed without possibility to forward the signal to its
children, leaving the bash script and tcpdump alive.
In order to fix it, catch SIGKILL for this process class and send
instead SIGUSR1. Then, modify the script under sudo to handle SIGUSR1 as
if it was a SIGKILL towards its children to make sure child process in
the netns terminates.
Change-Id: I2bf389c47bbbd75f46af413e7ba897be5be386e1
---
M src/osmo_gsm_tester/process.py
M utils/osmo-gsm-tester_netns_exec.sh
2 files changed, 42 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/11/13511/1
diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py
index 7ecb67e..441d4ea 100644
--- a/src/osmo_gsm_tester/process.py
+++ b/src/osmo_gsm_tester/process.py
@@ -363,6 +363,11 @@
# HACK: Since we run under sudo, only way to kill root-owned process is to
kill as root...
# This function is overwritten from Process.
def send_signal(self, sig):
+if sig == signal.SIGKILL:
+# if we kill sudo, its children (bash running NETNS_EXEC_BIN +
+# tcpdump under it) are kept alive. Let's instead tell the script
to
+# kill tcpdump:
+sig = signal.SIGUSR1
kill_cmd = ('kill', '-%d' % int(sig), str(self.process_obj.pid))
run_local_netns_sync(self.run_dir, self.name()+"-kill"+str(sig),
self.netns, kill_cmd)
diff --git a/utils/osmo-gsm-tester_netns_exec.sh
b/utils/osmo-gsm-tester_netns_exec.sh
index 336b746..182ebff 100755
--- a/utils/osmo-gsm-tester_netns_exec.sh
+++ b/utils/osmo-gsm-tester_netns_exec.sh
@@ -1,5 +1,41 @@
#!/bin/bash
netns="$1"
shift
+
+child_ps=0
+forward_kill() {
+ sig="$1"
+ echo "Caught signal SIG$sig!"
+ if [ "$child_ps" != "0" ]; then
+ echo "Killing $child_ps with SIG$sig!"
+ kill -SIG${sig} $child_ps
+ else
+ exit 0
+ fi
+}
+forward_kill_int() {
+ forward_kill "INT"
+}
+forward_kill_term() {
+ forward_kill "TERM"
+}
+forward_kill_usr1() {
+ # Special signal received from osmo-gsm-tester to tell child to SIGKILL
+ echo "Converting SIGUSR1->SIGKILL"
+ forward_kill "KILL"
+}
+# Don't use 'set -e', otherwise traps are not triggered!
+trap forward_kill_int INT
+trap forward_kill_term TERM
+trap forward_kill_usr1 USR1
+
#TODO: Later on I may want to call myself with specific ENV and calling sudo
in order to run inside the netns but with dropped privileges
-ip netns exec $netns "$@"
+ip netns exec $netns "$@" &
+child_ps=$!
+
+echo "$$: waiting for $child_ps"
+wait "$child_ps"
+child_exit_code="$?"
+echo "child exited with $child_exit_code"
+
+exit $child_exit_code
--
To view, visit https://gerrit.osmocom.org/13511
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bf389c47bbbd75f46af413e7ba897be5be386e1
Gerrit-Change-Number: 13511
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Change in libosmocore[master]: Add code coverage support
Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 1: I just found a problem with the latest autoconf-archive 2019.01.06, they have changed how AX_ADD_AM_MACRO_STATIC is used in a backward incompatible way. https://github.com/autoconf-archive/autoconf-archive/blob/master/NEWS#noteworthy-changes-in-release-20190106-2019-01-06-stable https://github.com/autoconf-archive/autoconf-archive/commit/b5a2d69f7a7e0133733673586231b88464a98d58 To resolve this in a more portable way I could copy the latest version of this macro in libosmocore's m4 directory. Would this be OK? -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 15:46:11 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in libosmocore[master]: Add code coverage support
Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 1: I just found a problem with the latest autoconf-archive 2019.01.06 -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vasil Velichkov Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 15:40:20 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-ttcn3-hacks[master]: MSC_Tests: fix TC_sgsap_expl_imsi_det_noneps
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13492 )
Change subject: MSC_Tests: fix TC_sgsap_expl_imsi_det_noneps
..
MSC_Tests: fix TC_sgsap_expl_imsi_det_noneps
When a subscriber is detached from non eps services, it gets fully
detached from 2G, which means that the VLR is supposed to remove the
subscriber. Lets check if the subscriber is in deed no longer known by
the VLR.
Change-Id: I2ec3f548dfcf5a9b99f10214a8bfd0c6978e253b
Related: OS#3614
---
M msc/MSC_Tests.ttcn
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 3b9ea40..c7c61eb 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -3862,8 +3862,10 @@
var octetstring mme_name := f_enc_dns_hostname(mp_mme_name);
SGsAP.send(ts_SGsAP_IMSI_DETACH_IND(g_pars.imsi, mme_name,
combined_UE_initiated));
SGsAP.receive(tr_SGsAP_IMSI_DETACH_ACK(g_pars.imsi));
- f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) &
".state", "SGs-NULL");
- /* FIXME: How to verify that VLR has removed MM context? */
+
+ if (f_ctrl_subscr_in_vlr(hex2str(g_pars.imsi))) {
+ setverdict(fail, "subscriber not removed from VLR");
+ }
f_sgsap_bssmap_screening();
--
To view, visit https://gerrit.osmocom.org/13492
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ec3f548dfcf5a9b99f10214a8bfd0c6978e253b
Gerrit-Change-Number: 13492
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-ttcn3-hacks[master]: MSC_Tests: add testcase TC_sgsap_impl_imsi_det_noneps
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13351 )
Change subject: MSC_Tests: add testcase TC_sgsap_impl_imsi_det_noneps
..
MSC_Tests: add testcase TC_sgsap_impl_imsi_det_noneps
We have a testcase that sends an explicit (UE-Initiated) imsi detach
from non EPS services. Lets also cover the case for an implicit
(Network-initated) detach.
Change-Id: I76049e6717680c54c18f97b7cd51944901a81ae7
Related: OS#3614
---
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
2 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index a15fa57..ca633dc 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -3854,6 +3854,33 @@
vc_conn.done;
}
+private function f_tc_sgsap_impl_imsi_det_noneps(charstring id,
BSC_ConnHdlrPars pars)
+runs on BSC_ConnHdlr {
+ f_init_handler(pars);
+ f_sgs_perform_lu();
+ f_sleep(3.0);
+
+ var octetstring mme_name := f_enc_dns_hostname(mp_mme_name);
+ SGsAP.send(ts_SGsAP_IMSI_DETACH_IND(g_pars.imsi, mme_name,
implicit_network_initiated));
+ SGsAP.receive(tr_SGsAP_IMSI_DETACH_ACK(g_pars.imsi));
+
+ if (f_ctrl_subscr_in_vlr(hex2str(g_pars.imsi))) {
+ setverdict(fail, "subscriber not removed from VLR");
+ }
+
+ f_sgsap_bssmap_screening();
+
+ setverdict(pass);
+}
+testcase TC_sgsap_impl_imsi_det_noneps() runs on MTC_CT {
+ var BSC_ConnHdlrPars pars;
+ var BSC_ConnHdlr vc_conn;
+ f_init(1, true);
+ pars := f_init_pars(11815, true);
+ vc_conn :=
f_start_handler_with_pars(refers(f_tc_sgsap_impl_imsi_det_noneps), pars);
+ vc_conn.done;
+}
+
/* Trigger a paging request via VTY and send a paging reject in response */
private function f_tc_sgsap_paging_rej(charstring id, BSC_ConnHdlrPars pars)
runs on BSC_ConnHdlr {
@@ -4649,6 +4676,7 @@
execute( TC_sgsap_lu_and_nothing() );
execute( TC_sgsap_expl_imsi_det_eps() );
execute( TC_sgsap_expl_imsi_det_noneps() );
+ execute( TC_sgsap_impl_imsi_det_noneps() );
execute( TC_sgsap_paging_rej() );
execute( TC_sgsap_paging_subscr_rej() );
execute( TC_sgsap_paging_ue_unr() );
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index 86e8a89..e829493 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -75,6 +75,7 @@
+
--
To view, visit https://gerrit.osmocom.org/13351
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I76049e6717680c54c18f97b7cd51944901a81ae7
Gerrit-Change-Number: 13351
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-ttcn3-hacks[master]: MSC_Tests: add testcase TC_sgsap_impl_imsi_det_eps
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13352 )
Change subject: MSC_Tests: add testcase TC_sgsap_impl_imsi_det_eps
..
MSC_Tests: add testcase TC_sgsap_impl_imsi_det_eps
We have a testcase that sends an explicit (UE-Initiated) imsi detach
from EPS services. Lets also cover the case for an implicit
(Network-initated) detach.
Change-Id: I63ebc32ae457dd74214d4abee4f511cde28de4a7
Related: OS#3614
---
M msc/MSC_Tests.ttcn
M msc/expected-results.xml
2 files changed, 26 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index ca633dc..3b9ea40 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -3829,6 +3829,30 @@
vc_conn.done;
}
+private function f_tc_sgsap_impl_imsi_det_eps(charstring id, BSC_ConnHdlrPars
pars)
+runs on BSC_ConnHdlr {
+ f_init_handler(pars);
+ f_sgs_perform_lu();
+ f_sleep(3.0);
+
+ var octetstring mme_name := f_enc_dns_hostname(mp_mme_name);
+ SGsAP.send(ts_SGsAP_EPS_DETACH_IND(g_pars.imsi, mme_name,
network_initiated));
+ SGsAP.receive(tr_SGsAP_EPS_DETACH_ACK(g_pars.imsi));
+ f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) &
".state", "SGs-NULL");
+
+ f_sgsap_bssmap_screening();
+
+ setverdict(pass);
+}
+testcase TC_sgsap_impl_imsi_det_eps() runs on MTC_CT {
+ var BSC_ConnHdlrPars pars;
+ var BSC_ConnHdlr vc_conn;
+ f_init(1, true);
+ pars := f_init_pars(11814, true);
+ vc_conn :=
f_start_handler_with_pars(refers(f_tc_sgsap_impl_imsi_det_eps), pars);
+ vc_conn.done;
+}
+
private function f_tc_sgsap_expl_imsi_det_noneps(charstring id,
BSC_ConnHdlrPars pars)
runs on BSC_ConnHdlr {
f_init_handler(pars);
@@ -4675,6 +4699,7 @@
execute( TC_sgsap_lu_imsi_reject() );
execute( TC_sgsap_lu_and_nothing() );
execute( TC_sgsap_expl_imsi_det_eps() );
+ execute( TC_sgsap_impl_imsi_det_eps() );
execute( TC_sgsap_expl_imsi_det_noneps() );
execute( TC_sgsap_impl_imsi_det_noneps() );
execute( TC_sgsap_paging_rej() );
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index e829493..2c0083c 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -74,6 +74,7 @@
+
--
To view, visit https://gerrit.osmocom.org/13352
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I63ebc32ae457dd74214d4abee4f511cde28de4a7
Gerrit-Change-Number: 13352
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-ttcn3-hacks[master]: MSC_Tests: add function to check if a subscriber is in VLR
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13491 )
Change subject: MSC_Tests: add function to check if a subscriber is in VLR
..
MSC_Tests: add function to check if a subscriber is in VLR
The control interface of osmo-msc is able to return a list with all
active subscribers from the VLR. Lets add a function, so that we can
check from TTCN3 if a specified subscriber is known by the VLR or not.
Change-Id: I7661ae55afe34795c3701d59795331b32d64c988
Related: OS#3614
---
M msc/MSC_Tests.ttcn
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 6b2b259..a15fa57 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -63,6 +63,8 @@
import from USSD_Helpers all;
import from DNS_Helpers all;
+import from TCCConversion_Functions all;
+
const integer NUM_BSC := 2;
type record of BSSAP_Configuration BSSAP_Configurations;
@@ -3540,6 +3542,21 @@
* too long / short TLV values
*/
+/* Check if a subscriber exists in the VLR */
+private function f_ctrl_subscr_in_vlr(charstring imsi_or_msisdn) runs on
BSC_ConnHdlr return boolean {
+
+ var CtrlValue active_subsribers;
+ var integer rc;
+ active_subsribers := f_ctrl_get(IPA_CTRL, "subscriber-list-active-v1");
+
+ rc := f_strstr(active_subsribers, imsi_or_msisdn);
+ if (rc < 0) {
+ return false;
+ }
+
+ return true;
+}
+
/* Perform a location updatye at the A-Interface and run some checks to confirm
* that everything is back to normal. */
private function f_sgsap_bssmap_screening() runs on BSC_ConnHdlr {
--
To view, visit https://gerrit.osmocom.org/13491
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7661ae55afe34795c3701d59795331b32d64c988
Gerrit-Change-Number: 13491
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-ci[master]: ansible: osmo-gsm-tester: Make modem net ifaces persistent
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13495 ) Change subject: ansible: osmo-gsm-tester: Make modem net ifaces persistent .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13495 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: Ic3ef75285aa84f9aa606562cd2f6166de186c1a6 Gerrit-Change-Number: 13495 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 03 Apr 2019 15:25:57 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jenkins-slave: Use "jessie-backports" only on jessie systems
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13502 ) Change subject: jenkins-slave: Use "jessie-backports" only on jessie systems .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/13502 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: Id62c03b9759367bd5bbe20144e9ad7048d12e61b Gerrit-Change-Number: 13502 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Apr 2019 15:25:31 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jenkins-slave: Use "jessie-backports" only on jessie systems
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13502 ) Change subject: jenkins-slave: Use "jessie-backports" only on jessie systems .. jenkins-slave: Use "jessie-backports" only on jessie systems Change-Id: Id62c03b9759367bd5bbe20144e9ad7048d12e61b --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Harald Welte: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 30e4ece..641c6f3 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -22,6 +22,7 @@ repo: 'deb http://ftp.debian.org/debian jessie-backports main' filename: 'backports' update_cache: yes + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' - name: install java for jessie apt: -- To view, visit https://gerrit.osmocom.org/13502 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: Id62c03b9759367bd5bbe20144e9ad7048d12e61b Gerrit-Change-Number: 13502 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-remsim[master]: README.md: add 'osmo-' prefix to remsim-{server, bankd, client}
Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/13510
Change subject: README.md: add 'osmo-' prefix to remsim-{server,bankd,client}
..
README.md: add 'osmo-' prefix to remsim-{server,bankd,client}
Change-Id: I42df660d8c7f696a12118d4e4c38f7ee9e48d2e8
---
M README.md
1 file changed, 21 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/10/13510/1
diff --git a/README.md b/README.md
index 8808338..8f2657f 100644
--- a/README.md
+++ b/README.md
@@ -4,22 +4,23 @@
This software suite is a work in progress.
-remsim-client
--
+osmo-remsim-client
+--
The client interfaces with GSM phones / modems via dedicated "Card
Emulation" devices such as the Osmocom SIMtrace2 or sysmocom sysmoQMOD
board + firmware. This hardware implements the ISO7816-3 electrical
interface and protocol handling and passes any TPDU headers received
-from the phone/modem to remsim-client for further processing of the
+from the phone/modem to osmo-remsim-client for further processing of the
TPDUs associated to the given APDU transfer.
-remsim-client connects via a RSPRO control connection to remsim-server
-at startup and registers itself. It will receive configuration data
-such as the remsim-bankd IP+Port and the ClientId from remsim-server.
+osmo-remsim-client connects via a RSPRO control connection to
+osmo-remsim-server at startup and registers itself. It will receive
+configuration data such as the osmo-remsim-bankd IP+Port and the
+ClientId from osmo-remsim-server.
-After receiving the configuration, remsim-client will establish a RSPRO
-data connection to the remsim-bankd IP:Port.
+After receiving the configuration, osmo-remsim-client will establish a
+RSPRO data connection to the osmo-remsim-bankd IP:Port.
As the USB interface for remote SIM in simtrace2.git uses one interface
per slot, we can implement the client in blocking mode, i.e. use
@@ -27,22 +28,22 @@
to a more complex async implementation.
-remsim-bankd
-
+osmo-remsim-bankd
+-
-The remsim-bankd (SIM Bank Daemon) manages one given SIM bank. The
+The osmo-remsim-bankd (SIM Bank Daemon) manages one given SIM bank. The
initial implementation supports a PC/SC driver to expose any PC/SC
compatible card readers as SIM bank.
-remsim-bankd initially connects via a RSPRO control connection to
-remsim-server at startup, and will in turn receive a set of initial
+osmo-remsim-bankd initially connects via a RSPRO control connection to
+osmo-remsim-server at startup, and will in turn receive a set of initial
[client,slot]:[bankd,slot] mappings. These mappings determine which
slot on the client (corresponding to a modem) is mapped to which slot on
-the SIM bank. Mappings can be updated by remsim-server at any given
+the SIM bank. Mappings can be updated by osmo-remsim-server at any given
point in time.
-remsim-bankd implements a RSPRO server, where it listens to connections
-from remsim-clients.
+osmo-remsim-bankd implements a RSPRO server, where it listens to
+connections from osmo-remsim-clients.
As PC/SC only offers a blocking API, there is one thread per PC/SC slot.
This thread will perform blocking I/O on the socket towards the client,
@@ -62,10 +63,10 @@
client has identified itself. The advantage is that the entire bankd
can live without any non-blocking I/O.
-The main thread handles the connection to remsim-server, where it can
-also use non-blocking I/O. However, re-connection would be required, to
-avoid stalling all banks/cards in the event of a connection loss to the
-server.
+The main thread handles the connection to osmo-remsim-server, where it
+can also use non-blocking I/O. However, re-connection would be
+required, to avoid stalling all banks/cards in the event of a connection
+loss to the server.
worker threads have the following states:
* INIT (just started)
--
To view, visit https://gerrit.osmocom.org/13510
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42df660d8c7f696a12118d4e4c38f7ee9e48d2e8
Gerrit-Change-Number: 13510
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte
Change in osmo-gsm-tester[master]: process: add signal to NetNSProcess kill path
Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/13509
Change subject: process: add signal to NetNSProcess kill path
..
process: add signal to NetNSProcess kill path
This allows to easily differentiate different calls to kill in order to
terminate the process when looking at the logs.
Change-Id: Ida88f2674b0ed1802f20c519aa4e3cbe81e0def8
---
M src/osmo_gsm_tester/process.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/09/13509/1
diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py
index a104e10..7ecb67e 100644
--- a/src/osmo_gsm_tester/process.py
+++ b/src/osmo_gsm_tester/process.py
@@ -364,7 +364,7 @@
# This function is overwritten from Process.
def send_signal(self, sig):
kill_cmd = ('kill', '-%d' % int(sig), str(self.process_obj.pid))
-run_local_netns_sync(self.run_dir, self.name()+"-kill", self.netns,
kill_cmd)
+run_local_netns_sync(self.run_dir, self.name()+"-kill"+str(sig),
self.netns, kill_cmd)
def run_local_sync(run_dir, name, popen_args):
--
To view, visit https://gerrit.osmocom.org/13509
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida88f2674b0ed1802f20c519aa4e3cbe81e0def8
Gerrit-Change-Number: 13509
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol
Change in libosmo-sccp[master]: sccp_scoc: add user arg to conn_create{, _id}()
Harald Welte has posted comments on this change. (
https://gerrit.osmocom.org/13508 )
Change subject: sccp_scoc: add user arg to conn_create{,_id}()
..
Patch Set 2:
I think the 'user' has a back-pointer to the instance, so you can basically
replace the 'instance' pointer with the 'user' pointer to make the API easier
to use.
--
To view, visit https://gerrit.osmocom.org/13508
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e
Gerrit-Change-Number: 13508
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Harald Welte
Gerrit-Comment-Date: Wed, 03 Apr 2019 14:49:09 +
Gerrit-HasComments: No
Gerrit-HasLabels: No
Change in libosmo-sccp[master]: sccp_scoc: move sccp_find_user() up
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13507 ) Change subject: sccp_scoc: move sccp_find_user() up .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieabeda3126dcc0349a06c0fc7c9e468b900d7855 Gerrit-Change-Number: 13507 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 14:48:25 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmo-sccp[master]: Cosmetic: sccp_scoc: fix local reference comments
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13506 )
Change subject: Cosmetic: sccp_scoc: fix local reference comments
..
Cosmetic: sccp_scoc: fix local reference comments
Remove all comments, that claim conn_id is the local reference. This
is only a hack, and should not be something to rely on. A properly
separated local reference will be introduced shortly.
Related: OS#3871
Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368
---
M src/sccp_internal.h
M src/sccp_scoc.c
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index 000f0f7..ad8a6fd 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -47,7 +47,7 @@
struct llist_head users;
/* routing context to be used in all outbound messages */
uint32_t route_ctx;
- /* next local reference to allocate */
+ /* next connection ID to allocate */
uint32_t next_id;
struct osmo_ss7_instance *ss7;
void *priv;
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index e58251f..726426c 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -458,7 +458,7 @@
#define INIT_TIMER(x, fn, priv)do { (x)->cb = fn; (x)->data =
priv; } while (0)
-/* allocate + init a SCCP Connection with given ID (local reference) */
+/* allocate + init a SCCP Connection with given ID */
static struct sccp_connection *conn_create_id(struct osmo_sccp_instance *inst,
uint32_t conn_id)
{
@@ -480,7 +480,7 @@
/* this might change at runtime, as it is not a constant :/ */
sccp_scoc_fsm.log_subsys = DLSCCP;
- /* we simply use the local reference as FSM instance name */
+ /* we simply use the connection ID as FSM instance name */
snprintf(name, sizeof(name), "%u", conn->conn_id);
conn->fi = osmo_fsm_inst_alloc(&sccp_scoc_fsm, conn, conn,
LOGL_DEBUG, name);
@@ -493,7 +493,7 @@
return conn;
}
-/* Search for next free connection ID (local reference) and allocate conn */
+/* Search for next free connection ID and allocate conn */
static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst)
{
uint32_t conn_id;
--
To view, visit https://gerrit.osmocom.org/13506
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368
Gerrit-Change-Number: 13506
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol
Change in libosmo-sccp[master]: Cosmetic: sccp_scoc: fix local reference comments
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13506 ) Change subject: Cosmetic: sccp_scoc: fix local reference comments .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368 Gerrit-Change-Number: 13506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Apr 2019 14:48:11 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmo-sccp[master]: Cosmetic: sccp_scoc: fix local reference comments
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13506 ) Change subject: Cosmetic: sccp_scoc: fix local reference comments .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368 Gerrit-Change-Number: 13506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Apr 2019 14:18:10 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jenkins-slave: Use "jessie-backports" only on jessie systems
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13502 ) Change subject: jenkins-slave: Use "jessie-backports" only on jessie systems .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13502 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: Id62c03b9759367bd5bbe20144e9ad7048d12e61b Gerrit-Change-Number: 13502 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 03 Apr 2019 14:15:18 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in libosmo-sccp[master]: sccp_scoc: add user arg to conn_create{, _id}()
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/13508 )
Change subject: sccp_scoc: add user arg to conn_create{,_id}()
..
sccp_scoc: add user arg to conn_create{,_id}()
Add the argument instead of calling conn_create() and setting
conn->user afterwards. Prepare for generating a local_ref inside
conn_create_id() in the future.
Related: OS#3871
Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e
---
M src/sccp_scoc.c
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/08/13508/2
--
To view, visit https://gerrit.osmocom.org/13508
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e
Gerrit-Change-Number: 13508
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-CC: Jenkins Builder (102)
Change in libosmo-sccp[master]: sccp_scoc: add user arg to conn_create{, _id}()
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13508
Change subject: sccp_scoc: add user arg to conn_create{,_id}()
..
sccp_scoc: add user arg to conn_create{,_id}()
Add the argument instead of calling conn_create() and setting
conn->user afterwards. Prepare for generating a local_ref inside
conn_create_id() in the future.
Related: OS#3871
Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e
---
M src/sccp_scoc.c
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/08/13508/1
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 82590a0..a916e58 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -459,7 +459,7 @@
#define INIT_TIMER(x, fn, priv)do { (x)->cb = fn; (x)->data =
priv; } while (0)
/* allocate + init a SCCP Connection with given ID */
-static struct sccp_connection *conn_create_id(struct osmo_sccp_instance *inst,
+static struct sccp_connection *conn_create_id(struct osmo_sccp_instance *inst,
struct osmo_sccp_user *user,
uint32_t conn_id)
{
struct sccp_connection *conn = talloc_zero(inst, struct
sccp_connection);
@@ -490,11 +490,12 @@
return NULL;
}
+ conn->user = user;
return conn;
}
/* Search for next free connection ID and allocate conn */
-static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst)
+static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst,
struct osmo_sccp_user *user)
{
uint32_t conn_id;
@@ -502,7 +503,7 @@
conn_id = inst->next_id++;
} while (conn_find_by_id(inst, conn_id));
- return conn_create_id(inst, conn_id);
+ return conn_create_id(inst, user, conn_id);
}
/* destroy a SCCP connection state, releasing all timers, terminating
@@ -1623,8 +1624,7 @@
return;
}
/* Allocate new connection */
- conn = conn_create(inst);
- conn->user = scu;
+ conn = conn_create(inst, scu);
conn->incoming = true;
} else {
uint32_t conn_id;
@@ -1718,14 +1718,13 @@
return sccp_sclc_user_sap_down(scu, oph);
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST):
/* Allocate new connection structure */
- conn = conn_create_id(inst, prim->u.connect.conn_id);
+ conn = conn_create_id(inst, scu, prim->u.connect.conn_id);
if (!conn) {
/* FIXME: inform SCCP user with proper reply */
LOGP(DLSCCP, LOGL_ERROR, "Cannot create conn-id for
primitive %s\n",
osmo_scu_prim_name(&prim->oph));
goto out;
}
- conn->user = scu;
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_RESPONSE):
case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST):
--
To view, visit https://gerrit.osmocom.org/13508
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e
Gerrit-Change-Number: 13508
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in libosmo-sccp[master]: sccp_scoc: move sccp_find_user() up
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13507
Change subject: sccp_scoc: move sccp_find_user() up
..
sccp_scoc: move sccp_find_user() up
Move it before sccp_scoc_rx_scrc_rout_fail(), so it can be used in
the latter function to figure out the local_ref from the user (follow
up commit).
Related: OS#3871
Change-Id: Ieabeda3126dcc0349a06c0fc7c9e468b900d7855
---
M src/sccp_scoc.c
1 file changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/07/13507/1
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 726426c..82590a0 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1329,6 +1329,31 @@
return xua;
}
+/* Find a SCCP user for given SUA message (based on SUA_IEI_DEST_ADDR */
+static struct osmo_sccp_user *sccp_find_user(struct osmo_sccp_instance *inst,
+struct xua_msg *xua)
+{
+ int rc;
+ struct osmo_sccp_addr called_addr;
+
+ rc = sua_addr_parse(&called_addr, xua, SUA_IEI_DEST_ADDR);
+ if (rc < 0) {
+ LOGP(DLSCCP, LOGL_ERROR, "Cannot find SCCP User for XUA "
+ "Message %s without valid DEST_ADDR\n",
+ xua_hdr_dump(xua, &xua_dialect_sua));
+ return NULL;
+ }
+
+ if (!(called_addr.presence & OSMO_SCCP_ADDR_T_SSN)) {
+ LOGP(DLSCCP, LOGL_ERROR, "Cannot resolve SCCP User for "
+ "XUA Message %s without SSN in CalledAddr\n",
+ xua_hdr_dump(xua, &xua_dialect_sua));
+ return NULL;
+ }
+
+ return sccp_user_find(inst, called_addr.ssn, called_addr.pc);
+}
+
/*! \brief SCOC: Receive SCRC Routing Failure
* \param[in] inst SCCP Instance on which we operate
* \param[in] xua SUA message that was failed to route
@@ -1355,31 +1380,6 @@
}
}
-/* Find a SCCP user for given SUA message (based on SUA_IEI_DEST_ADDR */
-static struct osmo_sccp_user *sccp_find_user(struct osmo_sccp_instance *inst,
-struct xua_msg *xua)
-{
- int rc;
- struct osmo_sccp_addr called_addr;
-
- rc = sua_addr_parse(&called_addr, xua, SUA_IEI_DEST_ADDR);
- if (rc < 0) {
- LOGP(DLSCCP, LOGL_ERROR, "Cannot find SCCP User for XUA "
- "Message %s without valid DEST_ADDR\n",
- xua_hdr_dump(xua, &xua_dialect_sua));
- return NULL;
- }
-
- if (!(called_addr.presence & OSMO_SCCP_ADDR_T_SSN)) {
- LOGP(DLSCCP, LOGL_ERROR, "Cannot resolve SCCP User for "
- "XUA Message %s without SSN in CalledAddr\n",
- xua_hdr_dump(xua, &xua_dialect_sua));
- return NULL;
- }
-
- return sccp_user_find(inst, called_addr.ssn, called_addr.pc);
-}
-
/* Generate a COERR based in input arguments */
static struct xua_msg *gen_coerr(uint32_t route_ctx, uint32_t dest_ref,
uint32_t err_cause)
--
To view, visit https://gerrit.osmocom.org/13507
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieabeda3126dcc0349a06c0fc7c9e468b900d7855
Gerrit-Change-Number: 13507
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in libosmo-sccp[master]: Cosmetic: sccp_scoc: fix local reference comments
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13506
Change subject: Cosmetic: sccp_scoc: fix local reference comments
..
Cosmetic: sccp_scoc: fix local reference comments
Remove all comments, that claim conn_id is the local reference. This
is only a hack, and should not be something to rely on. A properly
separated local reference will be introduced shortly.
Related: OS#3871
Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368
---
M src/sccp_internal.h
M src/sccp_scoc.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/06/13506/1
diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index 000f0f7..ad8a6fd 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -47,7 +47,7 @@
struct llist_head users;
/* routing context to be used in all outbound messages */
uint32_t route_ctx;
- /* next local reference to allocate */
+ /* next connection ID to allocate */
uint32_t next_id;
struct osmo_ss7_instance *ss7;
void *priv;
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index e58251f..726426c 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -458,7 +458,7 @@
#define INIT_TIMER(x, fn, priv)do { (x)->cb = fn; (x)->data =
priv; } while (0)
-/* allocate + init a SCCP Connection with given ID (local reference) */
+/* allocate + init a SCCP Connection with given ID */
static struct sccp_connection *conn_create_id(struct osmo_sccp_instance *inst,
uint32_t conn_id)
{
@@ -480,7 +480,7 @@
/* this might change at runtime, as it is not a constant :/ */
sccp_scoc_fsm.log_subsys = DLSCCP;
- /* we simply use the local reference as FSM instance name */
+ /* we simply use the connection ID as FSM instance name */
snprintf(name, sizeof(name), "%u", conn->conn_id);
conn->fi = osmo_fsm_inst_alloc(&sccp_scoc_fsm, conn, conn,
LOGL_DEBUG, name);
@@ -493,7 +493,7 @@
return conn;
}
-/* Search for next free connection ID (local reference) and allocate conn */
+/* Search for next free connection ID and allocate conn */
static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst)
{
uint32_t conn_id;
--
To view, visit https://gerrit.osmocom.org/13506
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368
Gerrit-Change-Number: 13506
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Change in libosmocore[master]: Add code coverage support
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG@7 PS1, Line 7: Add code coverage support > Would be great to have more verbose commit description, i.e. […] I guess everyone knows what "coverage" means in terms of software development/testing. So I'm not sure if a more detailed description is useful. https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG@10 PS1, Line 10: the resulting HTML report would be great to specify where that report is placed (path/filename). -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 12:34:16 + Gerrit-HasComments: Yes Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: configure.ac: Add --disable-remsim-bankd
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13504 ) Change subject: configure.ac: Add --disable-remsim-bankd .. configure.ac: Add --disable-remsim-bankd This allows builds on small/embedded platforms to avoid all the dependencies required by remsim-bankd, including libpcsc-lite Change-Id: I29a1a0131fdfea6742ec12d81228879066b1ff7e --- M configure.ac M doc/Makefile.am R doc/examples/bankd_pcsc_slots.csv M src/Makefile.am A src/bankd/Makefile.am R src/bankd/bankd.h R src/bankd/bankd_main.c R src/bankd/bankd_pcsc.c R src/bankd/driver_core.c R src/bankd/driver_pcsc.c R src/bankd/internal.h R src/bankd/main.c 12 files changed, 41 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index b369133..e87c8c8 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,6 @@ PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) PKG_CHECK_MODULES(OSMOSIM, libosmosim) -PKG_CHECK_MODULES(PCSC, libpcsclite) PKG_CHECK_MODULES(USB, libusb-1.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], @@ -52,6 +51,16 @@ AM_CONDITIONAL(BUILD_SERVER, test "x$osmo_ac_build_server" = "xyes") AC_SUBST(BUILD_SERVER) +AC_ARG_ENABLE([remsim-bankd],[AS_HELP_STRING([--disable-remsim-bankd], [Build osmo-remsim-bankd])], + [osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"]) +if test "$osmo_ac_build_bankd" = "yes"; then + AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd]) +fi +AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes") + PKG_CHECK_MODULES(PCSC, libpcsclite) +AC_SUBST(BUILD_BANKD) + + AC_CONFIG_MACRO_DIR([m4]) dnl checks for header files @@ -142,6 +151,7 @@ doc/manuals/Makefile src/Makefile src/rspro/Makefile + src/bankd/Makefile src/server/Makefile include/Makefile include/osmocom/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index adfdcf7..dd4a573 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = \ manuals \ $(NULL) + +EXTRA_DIST = examples/bankd_pcsc_slots.csv diff --git a/src/bankd_pcsc_slots.csv b/doc/examples/bankd_pcsc_slots.csv similarity index 100% rename from src/bankd_pcsc_slots.csv rename to doc/examples/bankd_pcsc_slots.csv diff --git a/src/Makefile.am b/src/Makefile.am index 5b6efb9..165c3f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ SUBDIRS = rspro +if BUILD_BANKD +SUBDIRS += bankd +endif if BUILD_SERVER SUBDIRS += server endif @@ -15,7 +18,7 @@ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c -noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h slotmap.h rspro_client_fsm.h \ +noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \ asn1c_helpers.h \ simtrace2/apdu_dispatch.h \ simtrace2/libusb_util.h \ @@ -23,16 +26,7 @@ simtrace2/simtrace_prot.h \ simtrace2/simtrace_usb.h -bin_PROGRAMS = osmo-remsim-bankd osmo-remsim-client-st2 -noinst_PROGRAMS = pcsc_test remsim-client - -pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c -pcsc_test_LDADD = $(OSMOCORE_LIBS) \ - $(PCSC_LIBS) libosmo-rspro.la - -osmo_remsim_bankd_SOURCES = slotmap.c bankd_main.c bankd_pcsc.c rspro_client_fsm.c debug.c -osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(PCSC_LIBS) libosmo-rspro.la -lcsv +bin_PROGRAMS = osmo-remsim-client-st2 remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c bankd_client_fsm.c debug.c remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ diff --git a/src/bankd/Makefile.am b/src/bankd/Makefile.am new file mode 100644 index 000..62ed581 --- /dev/null +++ b/src/bankd/Makefile.am @@ -0,0 +1,23 @@ +AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \ + -I$(top_srcdir)/include/osmocom/rspro \ + $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) $(OSMOSIM_CFLAGS) \ + $(PCSC_CFLAGS) + +noinst_HEADERS = bankd.h internal.h + +bin_PROGRAMS = osmo-remsim-bankd +noinst_PROGRAMS = pcsc_test + +pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c +pcsc_test_LDADD = $(OSMOCORE_LIBS) \ + $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la + +osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \ + bankd_main.c bankd_pcsc.c +osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) $(OSMOSIM_LIBS) \ + $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la -lcsv
Change in osmo-remsim[master]: configure.ac: Add --disable-remsim-bankd
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13504 ) Change subject: configure.ac: Add --disable-remsim-bankd .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29a1a0131fdfea6742ec12d81228879066b1ff7e Gerrit-Change-Number: 13504 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 12:29:17 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: configure.ac: Add --disable-remsim-server
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13503 ) Change subject: configure.ac: Add --disable-remsim-server .. configure.ac: Add --disable-remsim-server This allows builds on small/embedded platforms to avoid all the dependencies required by remsim-server, including ulfius, yder, etc. Closes: OS#3896 Change-Id: I2b1ec8a9a88b931ac56a63df6e37c580a92b --- M configure.ac M src/Makefile.am 2 files changed, 14 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 1d2ccc2..b369133 100644 --- a/configure.ac +++ b/configure.ac @@ -41,8 +41,16 @@ PKG_CHECK_MODULES(OSMOSIM, libosmosim) PKG_CHECK_MODULES(PCSC, libpcsclite) PKG_CHECK_MODULES(USB, libusb-1.0) -PKG_CHECK_MODULES(ULFIUS, libulfius) -PKG_CHECK_MODULES(JANSSON, jansson) + +AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], + [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"]) +if test "$osmo_ac_build_server" = "yes"; then + PKG_CHECK_MODULES(ULFIUS, libulfius) + PKG_CHECK_MODULES(JANSSON, jansson) + AC_DEFINE(BUILD_SERVER, 1, [Define if we want to build osmo-remsim-server]) +fi +AM_CONDITIONAL(BUILD_SERVER, test "x$osmo_ac_build_server" = "xyes") +AC_SUBST(BUILD_SERVER) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index d671f37..5b6efb9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = rspro server +SUBDIRS = rspro +if BUILD_SERVER +SUBDIRS += server +endif AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ -- To view, visit https://gerrit.osmocom.org/13503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2b1ec8a9a88b931ac56a63df6e37c580a92b Gerrit-Change-Number: 13503 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-remsim[master]: update .gitignore
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13505 ) Change subject: update .gitignore .. update .gitignore Change-Id: I3b58f79b65e552f835f10abedb287d87941d6f9e --- M .gitignore 1 file changed, 20 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 2ec5f9f..00378bc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ compile depcomp install-sh +libosmo-rspro.pc libtool ltmain.sh missing @@ -29,8 +30,22 @@ m4 gen_rspro.stamp -src/pcsc_test -src/remsim-bankd -src/remsim-client -src/simtrace2-remsim-client -src/server/remsim-server +src/osmo-remsim-client +src/osmo-remsim-client-st2 +src/bankd/pcsc_test +src/bankd/osmo-remsim-bankd +src/server/osmo-remsim-server + +contrib/deps +deps + +debian/tmp +debian/osmo-remsim-* +debian/libosmo-rspro0 +debian/libosmo-rspro-dev +debian/*.substvars +debian/*.debhelper.log +debian/autoreconf.* +debian/.debhelper +debian/debhelper* +debian/files -- To view, visit https://gerrit.osmocom.org/13505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b58f79b65e552f835f10abedb287d87941d6f9e Gerrit-Change-Number: 13505 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-remsim[master]: update .gitignore
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13505 ) Change subject: update .gitignore .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b58f79b65e552f835f10abedb287d87941d6f9e Gerrit-Change-Number: 13505 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 12:29:20 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: configure.ac: Add --disable-remsim-server
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13503 ) Change subject: configure.ac: Add --disable-remsim-server .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2b1ec8a9a88b931ac56a63df6e37c580a92b Gerrit-Change-Number: 13503 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 12:29:15 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: update .gitignore
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13505 Change subject: update .gitignore .. update .gitignore Change-Id: I3b58f79b65e552f835f10abedb287d87941d6f9e --- M .gitignore 1 file changed, 20 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/05/13505/1 diff --git a/.gitignore b/.gitignore index 2ec5f9f..00378bc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ compile depcomp install-sh +libosmo-rspro.pc libtool ltmain.sh missing @@ -29,8 +30,22 @@ m4 gen_rspro.stamp -src/pcsc_test -src/remsim-bankd -src/remsim-client -src/simtrace2-remsim-client -src/server/remsim-server +src/osmo-remsim-client +src/osmo-remsim-client-st2 +src/bankd/pcsc_test +src/bankd/osmo-remsim-bankd +src/server/osmo-remsim-server + +contrib/deps +deps + +debian/tmp +debian/osmo-remsim-* +debian/libosmo-rspro0 +debian/libosmo-rspro-dev +debian/*.substvars +debian/*.debhelper.log +debian/autoreconf.* +debian/.debhelper +debian/debhelper* +debian/files -- To view, visit https://gerrit.osmocom.org/13505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b58f79b65e552f835f10abedb287d87941d6f9e Gerrit-Change-Number: 13505 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte
Change in osmo-remsim[master]: configure.ac: Add --disable-remsim-bankd
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13504 Change subject: configure.ac: Add --disable-remsim-bankd .. configure.ac: Add --disable-remsim-bankd This allows builds on small/embedded platforms to avoid all the dependencies required by remsim-bankd, including libpcsc-lite Change-Id: I29a1a0131fdfea6742ec12d81228879066b1ff7e --- M configure.ac M doc/Makefile.am R doc/examples/bankd_pcsc_slots.csv M src/Makefile.am A src/bankd/Makefile.am R src/bankd/bankd.h R src/bankd/bankd_main.c R src/bankd/bankd_pcsc.c R src/bankd/driver_core.c R src/bankd/driver_pcsc.c R src/bankd/internal.h R src/bankd/main.c 12 files changed, 41 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/04/13504/1 diff --git a/configure.ac b/configure.ac index b369133..e87c8c8 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,6 @@ PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(OSMOABIS, libosmoabis) PKG_CHECK_MODULES(OSMOSIM, libosmosim) -PKG_CHECK_MODULES(PCSC, libpcsclite) PKG_CHECK_MODULES(USB, libusb-1.0) AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], @@ -52,6 +51,16 @@ AM_CONDITIONAL(BUILD_SERVER, test "x$osmo_ac_build_server" = "xyes") AC_SUBST(BUILD_SERVER) +AC_ARG_ENABLE([remsim-bankd],[AS_HELP_STRING([--disable-remsim-bankd], [Build osmo-remsim-bankd])], + [osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"]) +if test "$osmo_ac_build_bankd" = "yes"; then + AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd]) +fi +AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes") + PKG_CHECK_MODULES(PCSC, libpcsclite) +AC_SUBST(BUILD_BANKD) + + AC_CONFIG_MACRO_DIR([m4]) dnl checks for header files @@ -142,6 +151,7 @@ doc/manuals/Makefile src/Makefile src/rspro/Makefile + src/bankd/Makefile src/server/Makefile include/Makefile include/osmocom/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index adfdcf7..dd4a573 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = \ manuals \ $(NULL) + +EXTRA_DIST = examples/bankd_pcsc_slots.csv diff --git a/src/bankd_pcsc_slots.csv b/doc/examples/bankd_pcsc_slots.csv similarity index 100% rename from src/bankd_pcsc_slots.csv rename to doc/examples/bankd_pcsc_slots.csv diff --git a/src/Makefile.am b/src/Makefile.am index 5b6efb9..165c3f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ SUBDIRS = rspro +if BUILD_BANKD +SUBDIRS += bankd +endif if BUILD_SERVER SUBDIRS += server endif @@ -15,7 +18,7 @@ rspro/libosmo-asn1-rspro.la libosmo_rspro_la_SOURCES = rspro_util.c asn1c_helpers.c -noinst_HEADERS = debug.h bankd.h client.h internal.h rspro_util.h slotmap.h rspro_client_fsm.h \ +noinst_HEADERS = debug.h client.h rspro_util.h slotmap.h rspro_client_fsm.h \ asn1c_helpers.h \ simtrace2/apdu_dispatch.h \ simtrace2/libusb_util.h \ @@ -23,16 +26,7 @@ simtrace2/simtrace_prot.h \ simtrace2/simtrace_usb.h -bin_PROGRAMS = osmo-remsim-bankd osmo-remsim-client-st2 -noinst_PROGRAMS = pcsc_test remsim-client - -pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c -pcsc_test_LDADD = $(OSMOCORE_LIBS) \ - $(PCSC_LIBS) libosmo-rspro.la - -osmo_remsim_bankd_SOURCES = slotmap.c bankd_main.c bankd_pcsc.c rspro_client_fsm.c debug.c -osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ - $(PCSC_LIBS) libosmo-rspro.la -lcsv +bin_PROGRAMS = osmo-remsim-client-st2 remsim_client_SOURCES = remsim_client.c rspro_client_fsm.c bankd_client_fsm.c debug.c remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \ diff --git a/src/bankd/Makefile.am b/src/bankd/Makefile.am new file mode 100644 index 000..62ed581 --- /dev/null +++ b/src/bankd/Makefile.am @@ -0,0 +1,23 @@ +AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src \ + -I$(top_srcdir)/include/osmocom/rspro \ + $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) $(OSMOSIM_CFLAGS) \ + $(PCSC_CFLAGS) + +noinst_HEADERS = bankd.h internal.h + +bin_PROGRAMS = osmo-remsim-bankd +noinst_PROGRAMS = pcsc_test + +pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c +pcsc_test_LDADD = $(OSMOCORE_LIBS) \ + $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la + +osmo_remsim_bankd_SOURCES = ../slotmap.c ../rspro_client_fsm.c ../debug.c \ + bankd_main.c bankd_pcsc.c +osmo_remsim_bankd_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) $(OSMOSIM_LIBS) \ + $(PCSC_LIBS) $(top_builddir)/src/libosmo-rspro.la -lcsv + +# as sugge
Change in osmo-remsim[master]: configure.ac: Add --disable-remsim-server
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13503 Change subject: configure.ac: Add --disable-remsim-server .. configure.ac: Add --disable-remsim-server This allows builds on small/embedded platforms to avoid all the dependencies required by remsim-server, including ulfius, yder, etc. Closes: OS#3896 Change-Id: I2b1ec8a9a88b931ac56a63df6e37c580a92b --- M configure.ac M src/Makefile.am 2 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/03/13503/1 diff --git a/configure.ac b/configure.ac index 1d2ccc2..b369133 100644 --- a/configure.ac +++ b/configure.ac @@ -41,8 +41,16 @@ PKG_CHECK_MODULES(OSMOSIM, libosmosim) PKG_CHECK_MODULES(PCSC, libpcsclite) PKG_CHECK_MODULES(USB, libusb-1.0) -PKG_CHECK_MODULES(ULFIUS, libulfius) -PKG_CHECK_MODULES(JANSSON, jansson) + +AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server], [Build osmo-remsim-server])], + [osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"]) +if test "$osmo_ac_build_server" = "yes"; then + PKG_CHECK_MODULES(ULFIUS, libulfius) + PKG_CHECK_MODULES(JANSSON, jansson) + AC_DEFINE(BUILD_SERVER, 1, [Define if we want to build osmo-remsim-server]) +fi +AM_CONDITIONAL(BUILD_SERVER, test "x$osmo_ac_build_server" = "xyes") +AC_SUBST(BUILD_SERVER) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index d671f37..5b6efb9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = rspro server +SUBDIRS = rspro +if BUILD_SERVER +SUBDIRS += server +endif AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \ $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \ -- To view, visit https://gerrit.osmocom.org/13503 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2b1ec8a9a88b931ac56a63df6e37c580a92b Gerrit-Change-Number: 13503 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte
Change in osmo-ci[master]: osmocom-nightly-packages: build osmo-remsim
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13501 ) Change subject: osmocom-nightly-packages: build osmo-remsim .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13501 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: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 Gerrit-Change-Number: 13501 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 03 Apr 2019 10:25:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: osmocom-nightly-packages: build osmo-remsim
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13501 ) Change subject: osmocom-nightly-packages: build osmo-remsim .. osmocom-nightly-packages: build osmo-remsim As of Change-Id Id5044b1835190edc948952d207a5196a18669eb1, osmo-remsim contains Debian packaging information and hence we can build it as part of our nightly feeds. We're not yet enabling 'latest' builds as we need to wait for the next libosmo-abis release for that (requires the IPA keepalive FSM). Change-Id: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 0e4d655..d647d32 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -131,6 +131,8 @@ checkout libosmo-dsp # TODO: enable once release after libosmocore 1.0.1 and libosmo-netif 0.4.0 are available # checkout osmo-sysmon + # TODO: enable once libosmo-abis > 0.6.0 is available (IPA keepalive FSM) + # checkout osmo-remsim build limesuite --git-upstream-tree="$(get_last_tag limesuite)" build libosmocore @@ -158,6 +160,8 @@ build libosmo-dsp # TODO: enable once release after libosmocore 1.0.1 and libosmo-netif 0.4.0 are available # build osmo-sysmon + # TODO: enable once libosmo-abis > 0.6.0 is available (IPA keepalive FSM) + # build osmo-remsim cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ae6c1b5..7e1cede 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -185,6 +185,7 @@ checkout simtrace2 checkout libosmo-dsp checkout osmo-sysmon + checkout osmo-remsim create_osmo_trx_debian8_jessie @@ -217,6 +218,7 @@ build simtrace2 build libosmo-dsp build osmo-sysmon + build osmo-remsim download_bumpversion -- To view, visit https://gerrit.osmocom.org/13501 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: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 Gerrit-Change-Number: 13501 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte
Change in osmo-ci[master]: osmocom-nightly-packages: build osmo-remsim
Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/13501 ) Change subject: osmocom-nightly-packages: build osmo-remsim .. osmocom-nightly-packages: build osmo-remsim As of Change-Id Id5044b1835190edc948952d207a5196a18669eb1, osmo-remsim contains Debian packaging information and hence we can build it as part of our nightly feeds. We're not yet enabling 'latest' builds as we need to wait for the next libosmo-abis release for that (requires the IPA keepalive FSM). Change-Id: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/13501/2 -- To view, visit https://gerrit.osmocom.org/13501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 Gerrit-Change-Number: 13501 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte
Change in osmo-ci[master]: osmocom-latest-packages: Enable osmo-sysmon
Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/13500 ) Change subject: osmocom-latest-packages: Enable osmo-sysmon .. osmocom-latest-packages: Enable osmo-sysmon Since libosmocore 1.0.1 and libosmo-netif 0.4.0 are released, we can address the TOOD and build osmo-sysmon also in our latest feed. Change-Id: I48bd5aff2ae315b6f462facea70222eb2cdd2d58 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/13500/2 -- To view, visit https://gerrit.osmocom.org/13500 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I48bd5aff2ae315b6f462facea70222eb2cdd2d58 Gerrit-Change-Number: 13500 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte
Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/armv7l
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/armv7l
Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/armv7l
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 439s] #define HAVE_MEMORY_H 1
[ 439s] #define HAVE_STRINGS_H 1
[ 439s] #define HAVE_INTTYPES_H 1
[ 439s] #define HAVE_STDINT_H 1
[ 439s] #define HAVE_UNISTD_H 1
[ 439s] #define HAVE_DLFCN_H 1
[ 439s] #define LT_OBJDIR ".libs/"
[ 439s] #define PACKAGE "osmo-remsim"
[ 439s] #define VERSION "0.1.0.8-8e04"
[ 439s] #define HAVE_CSV_H 1
[ 439s]
[ 439s] configure: exit 1
[ 439s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf
--prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man
--infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf
--libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 439s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 439s] make[1]: *** [override_dh_auto_configure] Error 2
[ 439s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 439s] debian/rules:12: recipe for target 'build' failed
[ 439s] make: *** [build] Error 2
[ 439s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 439s]
[ 439s] obs-arm-5 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
09:30:02 UTC 2019.
[ 439s]
[ 439s] ### VM INTERACTION START ###
[ 442s] [ 410.164188] sysrq: SysRq : Power Off
[ 442s] [ 410.169043] reboot: Power down
[ 443s] ### VM INTERACTION END ###
[ 443s]
[ 443s] obs-arm-5 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
09:30:06 UTC 2019.
[ 443s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: Add code coverage support
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13496 ) Change subject: Add code coverage support .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/13496/1//COMMIT_MSG@7 PS1, Line 7: Add code coverage support Would be great to have more verbose commit description, i.e. why do we need this and how would we benefit from such coverage. The OS#1987 already has quite good description, so it can be copy-pasted ;) -- To view, visit https://gerrit.osmocom.org/13496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f4ffb91bd7f3dd070aa09dd16d5ad1faf130a4c Gerrit-Change-Number: 13496 Gerrit-PatchSet: 1 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 03 Apr 2019 09:06:14 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/x86_64
Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 190s] #define HAVE_MEMORY_H 1
[ 190s] #define HAVE_STRINGS_H 1
[ 190s] #define HAVE_INTTYPES_H 1
[ 190s] #define HAVE_STDINT_H 1
[ 190s] #define HAVE_UNISTD_H 1
[ 190s] #define HAVE_DLFCN_H 1
[ 190s] #define LT_OBJDIR ".libs/"
[ 190s] #define PACKAGE "osmo-remsim"
[ 190s] #define VERSION "0.1.0.8-8e04"
[ 190s] #define HAVE_CSV_H 1
[ 190s]
[ 190s] configure: exit 1
[ 190s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr
--includedir=${prefix}/include --mandir=${prefix}/share/man
--infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu
--libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 190s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 190s] make[1]: *** [override_dh_auto_configure] Error 2
[ 190s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 190s] debian/rules:12: recipe for target 'build' failed
[ 190s] make: *** [build] Error 2
[ 190s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 190s]
[ 190s] cloud125 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:13:20 UTC 2019.
[ 190s]
[ 190s] ### VM INTERACTION START ###
[ 193s] [ 160.863828] sysrq: SysRq : Power Off
[ 193s] [ 160.871385] reboot: Power down
[ 194s] ### VM INTERACTION END ###
[ 194s]
[ 194s] cloud125 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:13:25 UTC 2019.
[ 194s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_17.10/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_17.10/x86_64
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_17.10/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 158s] #define HAVE_MEMORY_H 1
[ 158s] #define HAVE_STRINGS_H 1
[ 158s] #define HAVE_INTTYPES_H 1
[ 158s] #define HAVE_STDINT_H 1
[ 158s] #define HAVE_UNISTD_H 1
[ 158s] #define HAVE_DLFCN_H 1
[ 158s] #define LT_OBJDIR ".libs/"
[ 158s] #define PACKAGE "osmo-remsim"
[ 158s] #define VERSION "0.1.0.8-8e04"
[ 158s] #define HAVE_CSV_H 1
[ 158s]
[ 158s] configure: exit 1
[ 158s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu
--libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 158s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 158s] make[1]: *** [override_dh_auto_configure] Error 2
[ 158s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 158s] debian/rules:12: recipe for target 'build' failed
[ 158s] make: *** [build] Error 2
[ 158s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 158s]
[ 158s] cloud124 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:13:01 UTC 2019.
[ 158s]
[ 158s] ### VM INTERACTION START ###
[ 161s] [ 125.458788] sysrq: SysRq : Power Off
[ 161s] [ 125.469234] reboot: Power down
[ 163s] ### VM INTERACTION END ###
[ 163s]
[ 163s] cloud124 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:13:06 UTC 2019.
[ 163s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/x86_64
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_18.04/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 85s] #define HAVE_MEMORY_H 1
[ 85s] #define HAVE_STRINGS_H 1
[ 85s] #define HAVE_INTTYPES_H 1
[ 85s] #define HAVE_STDINT_H 1
[ 85s] #define HAVE_UNISTD_H 1
[ 85s] #define HAVE_DLFCN_H 1
[ 85s] #define LT_OBJDIR ".libs/"
[ 85s] #define PACKAGE "osmo-remsim"
[ 85s] #define VERSION "0.1.0.8-8e04"
[ 85s] #define HAVE_CSV_H 1
[ 85s]
[ 85s] configure: exit 1
[ 85s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu
--libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 85s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 85s] make[1]: *** [override_dh_auto_configure] Error 2
[ 85s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 85s] debian/rules:12: recipe for target 'build' failed
[ 85s] make: *** [build] Error 2
[ 85s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 85s]
[ 85s] build71 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:11:34 UTC 2019.
[ 85s]
[ 85s] ### VM INTERACTION START ###
[ 88s] [ 77.925292] sysrq: SysRq : Power Off
[ 88s] [ 77.927741] reboot: Power down
[ 88s] ### VM INTERACTION END ###
[ 88s]
[ 88s] build71 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:11:37 UTC 2019.
[ 88s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.10/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.10/x86_64
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_18.10/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 92s] #define HAVE_STDLIB_H 1
[ 92s] #define HAVE_STRING_H 1
[ 92s] #define HAVE_MEMORY_H 1
[ 92s] #define HAVE_STRINGS_H 1
[ 92s] #define HAVE_INTTYPES_H 1
[ 92s] #define HAVE_STDINT_H 1
[ 92s] #define HAVE_UNISTD_H 1
[ 92s] #define HAVE_DLFCN_H 1
[ 92s] #define LT_OBJDIR ".libs/"
[ 92s] #define PACKAGE "osmo-remsim"
[ 92s] #define VERSION "0.1.0.8-8e04"
[ 92s] #define HAVE_CSV_H 1
[ 92s]
[ 92s] configure: exit 1
[ 92s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu
--libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 92s] make[1]: *** [debian/rules:15: override_dh_auto_configure] Error 2
[ 92s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 92s] make: *** [debian/rules:12: build] Error 2
[ 92s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 92s]
[ 92s] sheep84 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:11:22 UTC 2019.
[ 92s]
[ 92s] ### VM INTERACTION START ###
[ 95s] [ 86.102080] sysrq: SysRq : Power Off
[ 95s] [ 86.107827] reboot: Power down
[ 95s] ### VM INTERACTION END ###
[ 95s]
[ 95s] sheep84 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:11:25 UTC 2019.
[ 95s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/i586
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_18.04/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 118s] #define HAVE_MEMORY_H 1
[ 118s] #define HAVE_STRINGS_H 1
[ 118s] #define HAVE_INTTYPES_H 1
[ 118s] #define HAVE_STDINT_H 1
[ 118s] #define HAVE_UNISTD_H 1
[ 118s] #define HAVE_DLFCN_H 1
[ 118s] #define LT_OBJDIR ".libs/"
[ 118s] #define PACKAGE "osmo-remsim"
[ 118s] #define VERSION "0.1.0.8-8e04"
[ 118s] #define HAVE_CSV_H 1
[ 118s]
[ 118s] configure: exit 1
[ 118s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu
--libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 118s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 118s] make[1]: *** [override_dh_auto_configure] Error 2
[ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 118s] debian/rules:12: recipe for target 'build' failed
[ 118s] make: *** [build] Error 2
[ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 118s]
[ 118s] lamb01 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:10:26 UTC 2019.
[ 118s]
[ 118s] ### VM INTERACTION START ###
[ 121s] [ 108.736410] sysrq: SysRq : Power Off
[ 121s] [ 108.748423] reboot: Power down
[ 121s] ### VM INTERACTION END ###
[ 121s]
[ 121s] lamb01 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:10:29 UTC 2019.
[ 121s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_17.10/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_17.10/i586
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_17.10/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 87s] #define HAVE_MEMORY_H 1
[ 87s] #define HAVE_STRINGS_H 1
[ 87s] #define HAVE_INTTYPES_H 1
[ 87s] #define HAVE_STDINT_H 1
[ 87s] #define HAVE_UNISTD_H 1
[ 87s] #define HAVE_DLFCN_H 1
[ 87s] #define LT_OBJDIR ".libs/"
[ 87s] #define PACKAGE "osmo-remsim"
[ 87s] #define VERSION "0.1.0.8-8e04"
[ 87s] #define HAVE_CSV_H 1
[ 87s]
[ 87s] configure: exit 1
[ 87s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu
--libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 87s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 87s] make[1]: *** [override_dh_auto_configure] Error 2
[ 87s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 87s] debian/rules:12: recipe for target 'build' failed
[ 87s] make: *** [build] Error 2
[ 87s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 87s]
[ 87s] lamb12 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:08:45 UTC 2019.
[ 87s]
[ 87s] ### VM INTERACTION START ###
[ 90s] [ 77.280538] sysrq: SysRq : Power Off
[ 90s] [ 77.286344] reboot: Power down
[ 90s] ### VM INTERACTION END ###
[ 90s]
[ 90s] lamb12 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:08:49 UTC 2019.
[ 90s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586
Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 82s] #define HAVE_MEMORY_H 1
[ 82s] #define HAVE_STRINGS_H 1
[ 82s] #define HAVE_INTTYPES_H 1
[ 82s] #define HAVE_STDINT_H 1
[ 82s] #define HAVE_UNISTD_H 1
[ 82s] #define HAVE_DLFCN_H 1
[ 82s] #define LT_OBJDIR ".libs/"
[ 82s] #define PACKAGE "osmo-remsim"
[ 82s] #define VERSION "0.1.0.8-8e04"
[ 82s] #define HAVE_CSV_H 1
[ 82s]
[ 82s] configure: exit 1
[ 82s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr
--includedir=${prefix}/include --mandir=${prefix}/share/man
--infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu
--libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 82s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 82s] make[1]: *** [override_dh_auto_configure] Error 2
[ 82s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 82s] debian/rules:12: recipe for target 'build' failed
[ 82s] make: *** [build] Error 2
[ 82s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 82s]
[ 82s] lamb09 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:08:48 UTC 2019.
[ 82s]
[ 82s] ### VM INTERACTION START ###
[ 85s] [ 73.041114] sysrq: SysRq : Power Off
[ 85s] [ 73.047632] reboot: Power down
[ 85s] ### VM INTERACTION END ###
[ 85s]
[ 85s] lamb09 failed "build osmo-remsim_0.1.0.8.8e04.dsc" at Wed Apr 3
08:08:51 UTC 2019.
[ 85s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_18.04/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_18.04/i586
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_18.04/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 399s] #define HAVE_STRING_H 1
[ 399s] #define HAVE_MEMORY_H 1
[ 399s] #define HAVE_STRINGS_H 1
[ 399s] #define HAVE_INTTYPES_H 1
[ 399s] #define HAVE_STDINT_H 1
[ 399s] #define HAVE_UNISTD_H 1
[ 399s] #define HAVE_DLFCN_H 1
[ 399s] #define LT_OBJDIR ".libs/"
[ 399s] #define PACKAGE "osmo-remsim"
[ 399s] #define VERSION "0.1.0.7-08d8"
[ 399s]
[ 399s] configure: exit 1
[ 399s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu
--libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 399s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 399s] make[1]: *** [override_dh_auto_configure] Error 2
[ 399s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 399s] debian/rules:12: recipe for target 'build' failed
[ 399s] make: *** [build] Error 2
[ 399s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 399s]
[ 399s] lamb59 failed "build osmo-remsim_0.1.0.7.08d8.dsc" at Wed Apr 3
08:05:49 UTC 2019.
[ 399s]
[ 399s] ### VM INTERACTION START ###
[ 403s] [ 389.520640] sysrq: SysRq : Power Off
[ 403s] [ 389.561308] reboot: Power down
[ 403s] ### VM INTERACTION END ###
[ 403s]
[ 403s] lamb59 failed "build osmo-remsim_0.1.0.7.08d8.dsc" at Wed Apr 3
08:05:53 UTC 2019.
[ 403s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in xUbuntu_17.10/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/xUbuntu_17.10/i586
Package network:osmocom:nightly/osmo-remsim failed to build in
xUbuntu_17.10/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 148s] #define HAVE_STRING_H 1
[ 148s] #define HAVE_MEMORY_H 1
[ 148s] #define HAVE_STRINGS_H 1
[ 148s] #define HAVE_INTTYPES_H 1
[ 148s] #define HAVE_STDINT_H 1
[ 148s] #define HAVE_UNISTD_H 1
[ 148s] #define HAVE_DLFCN_H 1
[ 148s] #define LT_OBJDIR ".libs/"
[ 148s] #define PACKAGE "osmo-remsim"
[ 148s] #define VERSION "0.1.0.7-08d8"
[ 148s]
[ 148s] configure: exit 1
[ 148s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu
--libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 148s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 148s] make[1]: *** [override_dh_auto_configure] Error 2
[ 148s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 148s] debian/rules:12: recipe for target 'build' failed
[ 148s] make: *** [build] Error 2
[ 148s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 148s]
[ 148s] cloud125 failed "build osmo-remsim_0.1.0.7.08d8.dsc" at Wed Apr 3
08:01:52 UTC 2019.
[ 148s]
[ 148s] ### VM INTERACTION START ###
[ 151s] [ 120.551185] sysrq: SysRq : Power Off
[ 151s] [ 120.560871] reboot: Power down
[ 152s] ### VM INTERACTION END ###
[ 152s]
[ 152s] cloud125 failed "build osmo-remsim_0.1.0.7.08d8.dsc" at Wed Apr 3
08:01:57 UTC 2019.
[ 152s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in Debian_9.0/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_9.0/i586
Package network:osmocom:nightly/osmo-remsim failed to build in Debian_9.0/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-remsim
Last lines of build log:
[ 152s] #define HAVE_STRING_H 1
[ 152s] #define HAVE_MEMORY_H 1
[ 152s] #define HAVE_STRINGS_H 1
[ 152s] #define HAVE_INTTYPES_H 1
[ 152s] #define HAVE_STDINT_H 1
[ 152s] #define HAVE_UNISTD_H 1
[ 152s] #define HAVE_DLFCN_H 1
[ 152s] #define LT_OBJDIR ".libs/"
[ 152s] #define PACKAGE "osmo-remsim"
[ 152s] #define VERSION "0.1.0.7-08d8"
[ 152s]
[ 152s] configure: exit 1
[ 152s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr
--includedir=${prefix}/include --mandir=${prefix}/share/man
--infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu
--libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system
returned exit code 1
[ 152s] debian/rules:15: recipe for target 'override_dh_auto_configure' failed
[ 152s] make[1]: *** [override_dh_auto_configure] Error 2
[ 152s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 152s] debian/rules:12: recipe for target 'build' failed
[ 152s] make: *** [build] Error 2
[ 152s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 152s]
[ 152s] cloud127 failed "build osmo-remsim_0.1.0.7.08d8.dsc" at Wed Apr 3
08:01:43 UTC 2019.
[ 152s]
[ 152s] ### VM INTERACTION START ###
[ 155s] [ 119.025487] sysrq: SysRq : Power Off
[ 155s] [ 119.071089] reboot: Power down
[ 156s] ### VM INTERACTION END ###
[ 156s]
[ 156s] cloud127 failed "build osmo-remsim_0.1.0.7.08d8.dsc" at Wed Apr 3
08:01:48 UTC 2019.
[ 156s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-ci[master]: osmocom-nightly-packages: build osmo-remsim
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13501 Change subject: osmocom-nightly-packages: build osmo-remsim .. osmocom-nightly-packages: build osmo-remsim As of Change-Id Id5044b1835190edc948952d207a5196a18669eb1, osmo-remsim contains Debian packaging information and hence we can build it as part of our nightly feeds. Change-Id: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/13501/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index ae6c1b5..7e1cede 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -185,6 +185,7 @@ checkout simtrace2 checkout libosmo-dsp checkout osmo-sysmon + checkout osmo-remsim create_osmo_trx_debian8_jessie @@ -217,6 +218,7 @@ build simtrace2 build libosmo-dsp build osmo-sysmon + build osmo-remsim download_bumpversion -- To view, visit https://gerrit.osmocom.org/13501 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: Ic367dc95f46cece4bd769061af860fd82b4bd2e9 Gerrit-Change-Number: 13501 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte
Change in osmo-ci[master]: osmocom-latest-packages: Enable osmo-sysmon
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13500 Change subject: osmocom-latest-packages: Enable osmo-sysmon .. osmocom-latest-packages: Enable osmo-sysmon Since libosmocore 1.0.1 and libosmo-netif 0.4.0 are released, we can address the TOOD and build osmo-sysmon also in our latest feed. Change-Id: I48bd5aff2ae315b6f462facea70222eb2cdd2d58 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/13500/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 0e4d655..a2f845a 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -129,8 +129,7 @@ checkout osmo-bsc checkout simtrace2 checkout libosmo-dsp - # TODO: enable once release after libosmocore 1.0.1 and libosmo-netif 0.4.0 are available - # checkout osmo-sysmon + checkout osmo-sysmon build limesuite --git-upstream-tree="$(get_last_tag limesuite)" build libosmocore @@ -156,8 +155,7 @@ build osmo-bsc build simtrace2 build libosmo-dsp - # TODO: enable once release after libosmocore 1.0.1 and libosmo-netif 0.4.0 are available - # build osmo-sysmon + build osmo-sysmon cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" -- To view, visit https://gerrit.osmocom.org/13500 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: I48bd5aff2ae315b6f462facea70222eb2cdd2d58 Gerrit-Change-Number: 13500 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte
Change in osmo-ci[master]: jenkins-slave: Use "jessie-backports" only on jessie systems
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13502 Change subject: jenkins-slave: Use "jessie-backports" only on jessie systems .. jenkins-slave: Use "jessie-backports" only on jessie systems Change-Id: Id62c03b9759367bd5bbe20144e9ad7048d12e61b --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/13502/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 30e4ece..641c6f3 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -22,6 +22,7 @@ repo: 'deb http://ftp.debian.org/debian jessie-backports main' filename: 'backports' update_cache: yes + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' - name: install java for jessie apt: -- To view, visit https://gerrit.osmocom.org/13502 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: Id62c03b9759367bd5bbe20144e9ad7048d12e61b Gerrit-Change-Number: 13502 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte
Change in osmo-remsim[master]: rename executables to include osmo- name prefix
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13498 ) Change subject: rename executables to include osmo- name prefix .. rename executables to include osmo- name prefix Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425 --- M doc/manuals/chapters/overview.adoc M doc/manuals/chapters/remsim-bankd.adoc M doc/manuals/chapters/remsim-client.adoc M doc/manuals/chapters/remsim-server.adoc M src/Makefile.am M src/server/Makefile.am 6 files changed, 104 insertions(+), 100 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc index 0a303b1..842a3c7 100644 --- a/doc/manuals/chapters/overview.adoc +++ b/doc/manuals/chapters/overview.adoc @@ -36,51 +36,51 @@ Development of osmo-remsim software was funded by GSMK and sysmocom. -=== remsim-server +=== osmo-remsim-server -The remsim-server is the central element of the osmo-remsim +The `osmo-remsim-server` is the central element of the osmo-remsim architecture. All other elements connect to it. It maintains the inventory of other network elements, as well as the list of slot-mappings, i.e. the relationship between each given physical card in a bank and each card emulator attached to a phone/modem. -The tasks of remsim-server include: +The tasks of `osmo-remsim-server` include: -* accepting incoming TCP control connections from remsim-client and - remsim-bankd instances +* accepting incoming TCP control connections from `osmo-remsim-client` and + `osmo-remsim-bankd` instances * providing a RESTful JSON interface for external application logic to -=== remsim-client +=== osmo-remsim-client -The remsim-client software is co-located next to a cellular phone/modem. +The `osmo-remsim-client` software is co-located next to a cellular phone/modem. It typically runs on an [embedded] computer next to the phone/modem. -The tasks of remsim-client include: +The tasks of `osmo-remsim-client` include: * interaction over USB with a device supported by the 'SIMtrace2 cardem' firmware, which provides the physical interface to the phone/modem SIM interface -* establishing a TCP connection with the remsim-server, in order to +* establishing a TCP connection with the `osmo-remsim-server`, in order to enable the server to issue control commands -* under control of remsim-server, establishing a TCP connection to a - remsim-bankd in order to connect a card physically located at the +* under control of `osmo-remsim-server`, establishing a TCP connection to a + `osmo-remsim-bankd` in order to connect a card physically located at the bankd. -remsim-client supports at this point only one phone/modem. If you have +`osmo-remsim-client` supports at this point only one phone/modem. If you have multiple phones/modems at one location, you can simply run multiple -instances of remsim-client on the same system, one for each phone/modem. +instances of `osmo-remsim-client` on the same system, one for each phone/modem. -=== remsim-bankd +=== osmo-remsim-bankd -The remsim-bankd software is co-located next to a bank of SIM cards. +The `osmo-remsim-bankd` software is co-located next to a bank of SIM cards. -The tasks of remsim-bankd include: +The tasks of `osmo-remsim-bankd` include: * interaction with the actual card reader hardware. At this point, only PC/SC based readers are supported, with 1 to 255 slots per reader. -* establishing a TCP connection with the remsim-server, in order to +* establishing a TCP connection with the `osmo-remsim-server`, in order to enable the server to issue control commands -* running a TCP server where TCP connections from remsim-client +* running a TCP server where TCP connections from `osmo-remsim-client` instances are accepted and handled. diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc index 7e83621..317abf4 100644 --- a/doc/manuals/chapters/remsim-bankd.adoc +++ b/doc/manuals/chapters/remsim-bankd.adoc @@ -1,18 +1,18 @@ -== remsim-bankd +== osmo-remsim-bankd -The `remsim-bankd` (SIM Bank Daemon) manages one given SIM bank. The -initial implementation supports a PC/SC driver to expose any PC/SC +The `osmo-remsim-bankd` (SIM Bank Daemon) manages one given SIM bank. +The initial implementation supports a PC/SC driver to expose any PC/SC compatible card readers as SIM bank. -`remsim-bankd` initially connects via a RSPRO control connection to -`remsim-server` at startup, and will in turn receive a set of initial -[client,slot]:[bankd,slot] mappings. These mappings determine which -slot on the client (corresponding to a modem) is mapped to which slot on -the SIM bank. Mappings can be updated by `remsim-server` at any given -point in time. +`osmo-remsim-bankd` initially connects via a RSPRO control connection to +`osmo-remsim-server` a
Change in osmo-remsim[master]: Add Debian packaging information
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13499 )
Change subject: Add Debian packaging information
..
Add Debian packaging information
Change-Id: Id5044b1835190edc948952d207a5196a18669eb1
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/libosmo-rspro-dev.install
A debian/libosmo-rspro0.install
A debian/osmo-remsim-bankd.install
A debian/osmo-remsim-client.install
A debian/osmo-remsim-server.install
A debian/rules
10 files changed, 134 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ca4d246
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+osmo-remsim (0.1.0) unstable; urgency=medium
+
+ [ Harald Welte ]
+ * initial release.
+
+ -- Harald Welte Wed, 03 Apr 2019 08:59:40 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..8301a42
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,69 @@
+Source: osmo-remsim
+Maintainer: Harald Welte
+Section: net
+Priority: optional
+Build-Depends: debhelper (>= 9),
+ pkg-config,
+ dh-autoreconf,
+ dh-systemd (>= 1.5),
+ autotools-dev,
+ pkg-config,
+ libosmocore-dev,
+ libosmo-abis-dev,
+ libpcsclite-dev,
+ libusb-1.0-0-dev,
+ libulfius-dev,
+ libjansson-dev
+Standards-Version: 3.9.8
+Vcs-Browser: http://git.osmocom.org/osmo-remsim/
+Vcs-Git: git://git.osmocom.org/osmo-remsim
+Homepage: https://projects.osmocom.org/projects/osmo-remsim
+
+Package: libosmo-rspro0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: Osmocom Remote SIM - Shared Library
+ libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
+ based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
+ programs.
+
+Package: libosmo-rspro-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: Osmocom Remote SIM - Shared Library Development Haders
+ libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
+ based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
+ programs.
+
+Package: osmo-remsim-server
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Osmocom Remote SIM - Central Server
+ The remsim-server is the central element of a osmo-remsim deployment,
+ it maintains a list of clients + bankds connected to it, as well as the
+ dynamic SIM card mappings between them.
+
+Package: osmo-remsim-bankd
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Osmocom Remote SIM - Bank Daemon
+ The remsim-bankd is managing a bank of SIM card readers and their
+ respective cards. It establishes a control connection to remsim-server
+ and receives inbound connections from remsim-clients.
+
+Package: osmo-remsim-client
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Osmocom Remote SIM - Client
+ The remsim-client is managing a given phone/modem. It attaches to the
+ 'cardem' firmware of a SIMtrcace2 (or compatible, such as sysmoQMOD)
+ hardware and forwards the SIM card communication to a remsim-bankd,
+ under the control of remsim-server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8af2d2e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,25 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: osmo-remsim
+Source: http://cgit.osmocom.org/osmo-remsim/
+
+Files: *
+Copyright: 2018-2019 Harald Welte
+License: GPL-2+
+
+
+License: GPL-2+
+ This package is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
Change in osmo-remsim[master]: Add Debian packaging information
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13499 ) Change subject: Add Debian packaging information .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5044b1835190edc948952d207a5196a18669eb1 Gerrit-Change-Number: 13499 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 07:51:11 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: rename executables to include osmo- name prefix
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13498 ) Change subject: rename executables to include osmo- name prefix .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425 Gerrit-Change-Number: 13498 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 07:51:14 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: Add libosmo-rspro.pc.in for pkg-config integration
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13497 )
Change subject: Add libosmo-rspro.pc.in for pkg-config integration
..
Add libosmo-rspro.pc.in for pkg-config integration
Change-Id: Ic8bbf27bdb5ce7c810ede307a35ad4dc10338912
---
M Makefile.am
M configure.ac
A libosmo-rspro.pc.in
3 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/Makefile.am b/Makefile.am
index ec76bff..4843641 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
SUBDIRS = src include doc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libosmo-rspro.pc
+
EXTRA_DIST = asn1 .version README.md
pkgcofigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 7281196..1d2ccc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@
AC_OUTPUT(
Makefile
+ libosmo-rspro.pc
doc/Makefile
doc/manuals/Makefile
src/Makefile
diff --git a/libosmo-rspro.pc.in b/libosmo-rspro.pc.in
new file mode 100644
index 000..e810d42
--- /dev/null
+++ b/libosmo-rspro.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Osmocom RSPRO library
+Description: Osmocom Remote SIM Protocol library
+Version: @VERSION@
+Libs: -L${libdir} -losmo-rspro
+Cflags: -I${includedir}/
--
To view, visit https://gerrit.osmocom.org/13497
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8bbf27bdb5ce7c810ede307a35ad4dc10338912
Gerrit-Change-Number: 13497
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-remsim[master]: Add libosmo-rspro.pc.in for pkg-config integration
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13497 ) Change subject: Add libosmo-rspro.pc.in for pkg-config integration .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic8bbf27bdb5ce7c810ede307a35ad4dc10338912 Gerrit-Change-Number: 13497 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Wed, 03 Apr 2019 07:51:16 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-remsim[master]: rename executables to include osmo- name prefix
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13498 to look at the new patch set (#2). Change subject: rename executables to include osmo- name prefix .. rename executables to include osmo- name prefix Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425 --- M doc/manuals/chapters/overview.adoc M doc/manuals/chapters/remsim-bankd.adoc M doc/manuals/chapters/remsim-client.adoc M doc/manuals/chapters/remsim-server.adoc M src/Makefile.am M src/server/Makefile.am 6 files changed, 104 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/98/13498/2 -- To view, visit https://gerrit.osmocom.org/13498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425 Gerrit-Change-Number: 13498 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-remsim[master]: Add Debian packaging information
Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/13499
Change subject: Add Debian packaging information
..
Add Debian packaging information
Change-Id: Id5044b1835190edc948952d207a5196a18669eb1
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/libosmo-rspro-dev.install
A debian/libosmo-rspro0.install
A debian/osmo-remsim-bankd.install
A debian/osmo-remsim-client.install
A debian/osmo-remsim-server.install
A debian/rules
10 files changed, 134 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/99/13499/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ca4d246
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+osmo-remsim (0.1.0) unstable; urgency=medium
+
+ [ Harald Welte ]
+ * initial release.
+
+ -- Harald Welte Wed, 03 Apr 2019 08:59:40 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..8301a42
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,69 @@
+Source: osmo-remsim
+Maintainer: Harald Welte
+Section: net
+Priority: optional
+Build-Depends: debhelper (>= 9),
+ pkg-config,
+ dh-autoreconf,
+ dh-systemd (>= 1.5),
+ autotools-dev,
+ pkg-config,
+ libosmocore-dev,
+ libosmo-abis-dev,
+ libpcsclite-dev,
+ libusb-1.0-0-dev,
+ libulfius-dev,
+ libjansson-dev
+Standards-Version: 3.9.8
+Vcs-Browser: http://git.osmocom.org/osmo-remsim/
+Vcs-Git: git://git.osmocom.org/osmo-remsim
+Homepage: https://projects.osmocom.org/projects/osmo-remsim
+
+Package: libosmo-rspro0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: Osmocom Remote SIM - Shared Library
+ libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
+ based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
+ programs.
+
+Package: libosmo-rspro-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: Osmocom Remote SIM - Shared Library Development Haders
+ libosmo-rsrpo is an utility library for encoding/decoding the ASN.1 BER
+ based RSPRO (Remote SIM Protocol) protocol used between the osmo-remsim
+ programs.
+
+Package: osmo-remsim-server
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Osmocom Remote SIM - Central Server
+ The remsim-server is the central element of a osmo-remsim deployment,
+ it maintains a list of clients + bankds connected to it, as well as the
+ dynamic SIM card mappings between them.
+
+Package: osmo-remsim-bankd
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Osmocom Remote SIM - Bank Daemon
+ The remsim-bankd is managing a bank of SIM card readers and their
+ respective cards. It establishes a control connection to remsim-server
+ and receives inbound connections from remsim-clients.
+
+Package: osmo-remsim-client
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Osmocom Remote SIM - Client
+ The remsim-client is managing a given phone/modem. It attaches to the
+ 'cardem' firmware of a SIMtrcace2 (or compatible, such as sysmoQMOD)
+ hardware and forwards the SIM card communication to a remsim-bankd,
+ under the control of remsim-server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8af2d2e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,25 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: osmo-remsim
+Source: http://cgit.osmocom.org/osmo-remsim/
+
+Files: *
+Copyright: 2018-2019 Harald Welte
+License: GPL-2+
+
+
+License: GPL-2+
+ This package is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
Change in osmo-remsim[master]: rename executables to include osmo- name prefix
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13498 Change subject: rename executables to include osmo- name prefix .. rename executables to include osmo- name prefix Change-Id: I4498a004519499cc4b897a68c7f33efe29a63425 --- M doc/manuals/chapters/remsim-bankd.adoc M doc/manuals/chapters/remsim-client.adoc M doc/manuals/chapters/remsim-server.adoc M src/Makefile.am M src/server/Makefile.am 5 files changed, 86 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/98/13498/1 diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc index 7e83621..317abf4 100644 --- a/doc/manuals/chapters/remsim-bankd.adoc +++ b/doc/manuals/chapters/remsim-bankd.adoc @@ -1,18 +1,18 @@ -== remsim-bankd +== osmo-remsim-bankd -The `remsim-bankd` (SIM Bank Daemon) manages one given SIM bank. The -initial implementation supports a PC/SC driver to expose any PC/SC +The `osmo-remsim-bankd` (SIM Bank Daemon) manages one given SIM bank. +The initial implementation supports a PC/SC driver to expose any PC/SC compatible card readers as SIM bank. -`remsim-bankd` initially connects via a RSPRO control connection to -`remsim-server` at startup, and will in turn receive a set of initial -[client,slot]:[bankd,slot] mappings. These mappings determine which -slot on the client (corresponding to a modem) is mapped to which slot on -the SIM bank. Mappings can be updated by `remsim-server` at any given -point in time. +`osmo-remsim-bankd` initially connects via a RSPRO control connection to +`osmo-remsim-server` at startup, and will in turn receive a set of +initial [client,slot]:[bankd,slot] mappings. These mappings determine +which slot on the client (corresponding to a modem) is mapped to which +slot on the SIM bank. Mappings can be updated by `osmo-remsim-server` +at any given point in time. -`remsim-bankd` implements a RSPRO server, where it listens to connections -from `remsim-clients`. +`osmo-remsim-bankd` implements a RSPRO server, where it listens to +connections from `osmo-remsim-clients`. As PC/SC only offers a blocking API, there is one thread per PC/SC slot. This thread will perform blocking I/O on the socket towards the client, @@ -32,10 +32,10 @@ client has identified itself. The advantage is that the entire bankd can live without any non-blocking I/O. -The main thread handles the connection to `remsim-server`, where it can -also use non-blocking I/O. However, re-connection would be required, to -avoid stalling all banks/cards in the event of a connection loss to the -server. +The main thread handles the connection to `osmo-remsim-server`, where it +can also use non-blocking I/O. However, re-connection would be +required, to avoid stalling all banks/cards in the event of a connection +loss to the server. worker threads have the following states: * INIT (just started) @@ -56,39 +56,40 @@ === Running -`remsim-bankd` currently has the following command-line options: +`osmo-remsim-bankd` currently has the following command-line options: SYNOPSIS -*remsim-bankd* [-h] [-i A.B.C.D] [-p <1-65535>] [-b <1-65535>] [-n <1-65535>] [-I A.B.C.D] [-P <1-65535> ] +*osmo-remsim-bankd* [-h] [-i A.B.C.D] [-p <1-65535>] [-b <1-65535>] [-n <1-65535>] [-I A.B.C.D] [-P <1-65535> ] OPTIONS *-h, --help*:: Print a short help message about the supported options *-i, --server-host A.B.C.D*:: - Specify the remote IP address/hostname of the remsim-server to which this bankd - shall establish its RSPRO control connection + Specify the remote IP address/hostname of the `osmo-remsim-server` to + which this bankd shall establish its RSPRO control connection *-p, --server-port <1-65535>*:: - Specify the remote TCP port number of the remsim-server to whihc this bankd - shall establish its RSPRO control connection + Specify the remote TCP port number of the `osmo-remsim-server` to which + this bankd shall establish its RSPRO control connection *-b, --bank-id <1-65535>*:: - Specify the numeric bank identifier of the SIM bank this bankd instance - operates. Must be unique among all banks connecting to the same remsim-server. + Specify the numeric bank identifier of the SIM bank this bankd + instance operates. Must be unique among all banks connecting to the + same `osmo-remsim-server`. *-n, --num-slots <1-65535>*:: Specify the number of slots that this bankd handles. *-I, --bind-IP A.B.C.D*:: Specify the local IP address to which the socket for incoming connections - from remsim-clients is bound to. + from `osmo-remsim-clients` is bound to. *-P, --bind-port <1-65535>*:: Specify the local TCP port to whicc the socket for incoming connections - from remsim-clients is bound to. + from `osmo-remsim-client`s is bound to. === Logging -remsim-bankd currently logs to stdout only, and the logging verbosity -is
Change in osmo-remsim[master]: Add libosmo-rspro.pc.in for pkg-config integration
Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/13497
Change subject: Add libosmo-rspro.pc.in for pkg-config integration
..
Add libosmo-rspro.pc.in for pkg-config integration
Change-Id: Ic8bbf27bdb5ce7c810ede307a35ad4dc10338912
---
M Makefile.am
M configure.ac
A libosmo-rspro.pc.in
3 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/97/13497/1
diff --git a/Makefile.am b/Makefile.am
index ec76bff..4843641 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
SUBDIRS = src include doc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libosmo-rspro.pc
+
EXTRA_DIST = asn1 .version README.md
pkgcofigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 7281196..1d2ccc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@
AC_OUTPUT(
Makefile
+ libosmo-rspro.pc
doc/Makefile
doc/manuals/Makefile
src/Makefile
diff --git a/libosmo-rspro.pc.in b/libosmo-rspro.pc.in
new file mode 100644
index 000..e810d42
--- /dev/null
+++ b/libosmo-rspro.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Osmocom RSPRO library
+Description: Osmocom Remote SIM Protocol library
+Version: @VERSION@
+Libs: -L${libdir} -losmo-rspro
+Cflags: -I${includedir}/
--
To view, visit https://gerrit.osmocom.org/13497
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8bbf27bdb5ce7c810ede307a35ad4dc10338912
Gerrit-Change-Number: 13497
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte
Change in osmo-ci[master]: Change jessie-backports URL to debian archive
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/13485 )
Change subject: Change jessie-backports URL to debian archive
..
Change jessie-backports URL to debian archive
Fix docker/Dockerfile_osmocom_jenkins.amd64 by fetching jessie-backports
from debian archive.
The jessie image is still being used by various jenkins jobs generated
by master-builds.yml and gerrit-verifications.yml. We want to keep using
it for some more time, to make sure that build testing ("make check")
passes on debian8/jessie, as some users may very well be using old
distros.
See also:
* https://lists.debian.org/debian-devel-announce/2019/03/msg6.html
* https://unix.stackexchange.com/q/508724
Related: OS#3894
Change-Id: Iba033e64876b7ed9d329c2a636a0ee5eb3af946e
---
M docker/Dockerfile_osmocom_jenkins.amd64
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
osmith: Verified
Harald Welte: Looks good to me, approved
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64
b/docker/Dockerfile_osmocom_jenkins.amd64
index c365380..f87d80d 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -2,9 +2,9 @@
FROM debian:${DEBIAN_VERSION}
RUN \
-echo "deb http://ftp.debian.org/debian jessie-backports main" >>
/etc/apt/sources.list && \
+echo "deb http://archive.debian.org/debian jessie-backports main" >>
/etc/apt/sources.list && \
dpkg --add-architecture i386 && \
-DEBIAN_FRONTEND=noninteractive apt-get update && \
+DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Check-Valid-Until=false
update && \
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
wget make
--
To view, visit https://gerrit.osmocom.org/13485
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: Iba033e64876b7ed9d329c2a636a0ee5eb3af946e
Gerrit-Change-Number: 13485
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Holger Freyther
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: osmith
Change in osmo-ci[master]: docker/rebuild_osmocom_jenkins_image.sh: pull images
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/13486 )
Change subject: docker/rebuild_osmocom_jenkins_image.sh: pull images
..
docker/rebuild_osmocom_jenkins_image.sh: pull images
Prevent building docker images on top of outdated Debian images, where
the package download feeds have been disabled.
Related: Change-Id I1076bbb7d77bdc99f5d60d641c09ce965fb9dfc6
(docker-playground.git)
Related: OS#3869
Change-Id: Id840094aec51bf51d920aaa017a2f99fcb866f55
---
M docker/rebuild_osmocom_jenkins_image.sh
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
osmith: Verified
Harald Welte: Looks good to me, approved
diff --git a/docker/rebuild_osmocom_jenkins_image.sh
b/docker/rebuild_osmocom_jenkins_image.sh
index 3dcca39..6cf2f15 100755
--- a/docker/rebuild_osmocom_jenkins_image.sh
+++ b/docker/rebuild_osmocom_jenkins_image.sh
@@ -15,6 +15,9 @@
local tag_name=${1}
local debian_version=${2}
+ echo "Pulling ${debian_version} image"
+ docker pull "debian:${debian_version}"
+
echo "Building for ${debian_version} and setting tag ${tag_name}"
build_once "-t" "${tag_name}" "--build-arg"
DEBIAN_VERSION="${debian_version}"
}
--
To view, visit https://gerrit.osmocom.org/13486
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: Id840094aec51bf51d920aaa017a2f99fcb866f55
Gerrit-Change-Number: 13486
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Holger Freyther
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: osmith
Change in osmo-ci[master]: docker/rebuild_osmocom_jenkins_image.sh: set -e
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/13487 )
Change subject: docker/rebuild_osmocom_jenkins_image.sh: set -e
..
docker/rebuild_osmocom_jenkins_image.sh: set -e
Exit with error if one of the docker commands is failing (i.e. don't
exit with 0 when building the jessie image failed, but the stretch
image got built properly).
Change-Id: I6faaf9303b4facb0965131615bc73541dd309c51
---
M docker/rebuild_osmocom_jenkins_image.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
osmith: Verified
Harald Welte: Looks good to me, approved
diff --git a/docker/rebuild_osmocom_jenkins_image.sh
b/docker/rebuild_osmocom_jenkins_image.sh
index 6cf2f15..c4e3b10 100755
--- a/docker/rebuild_osmocom_jenkins_image.sh
+++ b/docker/rebuild_osmocom_jenkins_image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
# Executes docker build with the given parameters and retry in case of error.
function build_once() {
--
To view, visit https://gerrit.osmocom.org/13487
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: I6faaf9303b4facb0965131615bc73541dd309c51
Gerrit-Change-Number: 13487
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Daniel Willmann
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Holger Freyther
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: osmith
