Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 534s] ar: `u' modifier ignored since `D' is the default (see `U') [ 534s] libtool: link: ranlib .libs/libtransceiver_common.a [ 534s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 534s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 535s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 535s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 535s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 535s] collect2: error: ld returned 1 exit status [ 535s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 535s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 535s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 535s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 535s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 535s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 535s] make[1]: *** [Makefile:444: all] Error 2 [ 535s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 535s] dh_auto_build: make -j1 returned exit code 2 [ 535s] make: *** [debian/rules:6: build] Error 255 [ 535s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 535s] [ 535s] cloud120 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Sat Sep 21 02:02:55 UTC 2019. [ 535s] [ 535s] ### VM INTERACTION START ### [ 538s] [ 487.031737] sysrq: SysRq : Power Off [ 538s] [ 487.036687] reboot: Power down [ 540s] ### VM INTERACTION END ### [ 540s] [ 540s] cloud120 failed "build osmo-trx_1.1.1.28.ee2b.dsc" at Sat Sep 21 02:03:01 UTC 2019. [ 540s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-iuh[master]: asn1enum.pl: Make compatible with modern perl
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-iuh/+/15588 )
Change subject: asn1enum.pl: Make compatible with modern perl
..
asn1enum.pl: Make compatible with modern perl
This fixes the following error message:
Experimental keys on scalar is now forbidden at ./asn1enum.pl line 25.
Change-Id: I4680627acfd8f3ed73d32324fe0a54b554268f3b
---
M asn1/asn1enum.pl
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/asn1/asn1enum.pl b/asn1/asn1enum.pl
index 8584e84..beac35f 100755
--- a/asn1/asn1enum.pl
+++ b/asn1/asn1enum.pl
@@ -22,7 +22,7 @@
next;
}
printf("%s ::= INTEGER {\n", $k);
- foreach my $r (sort { $a <=> $b } keys $h{$k}) {
+ foreach my $r (sort { $a <=> $b } keys %{$h{$k}}) {
printf("\t%s(%d),\n", $h{$k}{$r}, $r);
}
printf("}\n");
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15588
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I4680627acfd8f3ed73d32324fe0a54b554268f3b
Gerrit-Change-Number: 15588
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-iuh[master]: asn1enum.pl: Make compatible with modern perl
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15588 ) Change subject: asn1enum.pl: Make compatible with modern perl .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I4680627acfd8f3ed73d32324fe0a54b554268f3b Gerrit-Change-Number: 15588 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 22:10:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Move multi-ARFCN chan amount modification from UHDDevice to parent class
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15542 )
Change subject: Move multi-ARFCN chan amount modification from UHDDevice to
parent class
..
Move multi-ARFCN chan amount modification from UHDDevice to parent class
This way switch is applied correctly to parent structures and features
can be used later by other children classes (other devices).
Change-Id: I24d6c66bb3195ba2513b4a67daa14cdfbacdce6d
---
M Transceiver52M/device/common/radioDevice.h
M Transceiver52M/device/uhd/UHDDevice.cpp
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Transceiver52M/device/common/radioDevice.h
b/Transceiver52M/device/common/radioDevice.h
index 1d85204..d27a52c 100644
--- a/Transceiver52M/device/common/radioDevice.h
+++ b/Transceiver52M/device/common/radioDevice.h
@@ -171,12 +171,17 @@
std::vector tx_paths, rx_paths;
std::vector m_ctr;
- RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chans,
double offset,
+ RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t
chan_num, double offset,
const std::vector& tx_paths,
const std::vector& rx_paths):
- tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chans),
lo_offset(offset),
+ tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chan_num),
lo_offset(offset),
tx_paths(tx_paths), rx_paths(rx_paths)
{
+ if (iface == MULTI_ARFCN) {
+ LOGC(DDEV, INFO) << "Multi-ARFCN: "<< chan_num << "
logical chans -> 1 physical chans";
+ chans = 1;
+ }
+
m_ctr.resize(chans);
for (size_t i = 0; i < chans; i++) {
memset(&m_ctr[i], 0, sizeof(m_ctr[i]));
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index 809bade..604bb44 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -382,7 +382,6 @@
if (dev_type != B200 && dev_type != B210)
throw std::invalid_argument("Device does not support
MCBTS");
dev_type = B2XX_MCBTS;
- chans = 1;
}
if (chans > dev_param_map.at(dev_key(dev_type, tx_sps,
rx_sps)).channels)
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15542
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I24d6c66bb3195ba2513b4a67daa14cdfbacdce6d
Gerrit-Change-Number: 15542
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterface: Mark setRxGain as virtual
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15541 ) Change subject: radioInterface: Mark setRxGain as virtual .. radioInterface: Mark setRxGain as virtual Otherwise the parent function is always called even if the iface is radioInterfaceMult. Change-Id: Ie41efab1e60b88677bbd1ec333ea656794503a5a --- M Transceiver52M/radioInterface.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 83e00b9..b12c187 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -107,7 +107,7 @@ virtual bool tuneRx(double freq, size_t chan = 0); /** set receive gain */ - double setRxGain(double dB, size_t chan = 0); + virtual double setRxGain(double dB, size_t chan = 0); /** drive transmission of GSM bursts */ void driveTransmitRadio(std::vector &bursts, @@ -182,5 +182,5 @@ bool tuneTx(double freq, size_t chan); bool tuneRx(double freq, size_t chan); - double setRxGain(double dB, size_t chan); + virtual double setRxGain(double dB, size_t chan); }; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie41efab1e60b88677bbd1ec333ea656794503a5a Gerrit-Change-Number: 15541 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Transceiver: Fixed copying of history into and from channelizer buffer.
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15413 )
Change subject: Transceiver: Fixed copying of history into and from channelizer
buffer.
..
Transceiver: Fixed copying of history into and from channelizer buffer.
In multi arfcn mode, osmo-trx would drop some bursts because it couldn't detect
it
and would emit idle burst instead. Specificaly detection of peak in correlation
vector failed. Correcting copying of history in pullBuffer method fixes this
issue.
[Re-worked by Pau Espin Pedrol ]
Fixes: 57df2362f0eca0a330aad3e18906046dfadb9c8b
Change-Id: I93e43f6868cd67e69fc59d2980a03550d2505bf8
---
M Transceiver52M/radioInterfaceMulti.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Transceiver52M/radioInterfaceMulti.cpp
b/Transceiver52M/radioInterfaceMulti.cpp
index 99f6231..eec426e 100644
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -288,7 +288,7 @@
complex *dst = history[lchan]->begin();
float *fsrc = &buf[2 * (cLen - hLen)];
for (i = 0; i < hLen; i++) {
- *dst = complex(fdst[0], fdst[1]);
+ *dst = complex(fsrc[0], fsrc[1]);
fsrc += 2;
dst++;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15413
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I93e43f6868cd67e69fc59d2980a03550d2505bf8
Gerrit-Change-Number: 15413
Gerrit-PatchSet: 3
Gerrit-Owner: timojacobus
Gerrit-Assignee: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Reviewer: timojacobus
Gerrit-Reviewer: tnt
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: radioInterface: Atomically fetch and change underrun variable
Hello tnt, fixeria, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/15524 to look at the new patch set (#2). Change subject: radioInterface: Atomically fetch and change underrun variable .. radioInterface: Atomically fetch and change underrun variable Otherwise, it could happen that underrun events are lost: TxLower (isUnderrun): RxLower (pullBuffer): read(underrun) read(underrun) write(underrun, |val) [maybe underrun becomes TRUE] write(underrun, false) Similary, it could happen the other direction if atomic was only applied to isUnderrun: TxLower (isUnderrun): RxLower (pullBuffer): read(underrun) -> true read(underrun)-> true write(underrun, false) write(underrun, true|val) where val=false So in here isUnderrun would return true twice while it should only return one. Change-Id: I684e0a5d2a9583a161d5a6593559b3a9e7cd57e3 --- M CommonLibs/Threads.cpp M CommonLibs/Threads.h M Transceiver52M/osmo-trx.cpp M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/radioInterfaceResamp.cpp M configure.ac 8 files changed, 61 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/24/15524/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I684e0a5d2a9583a161d5a6593559b3a9e7cd57e3 Gerrit-Change-Number: 15524 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: newpatchset
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 1295s] ar: `u' modifier ignored since `D' is the default (see `U') [ 1295s] libtool: link: ranlib .libs/libtransceiver_common.a [ 1295s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 1295s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 1295s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 1296s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 1296s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 1296s] collect2: error: ld returned 1 exit status [ 1296s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 1296s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 1296s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 1296s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 1296s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 1296s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1296s] make[1]: *** [Makefile:444: all] Error 2 [ 1296s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1296s] dh_auto_build: make -j1 returned exit code 2 [ 1296s] make: *** [debian/rules:6: build] Error 255 [ 1296s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1296s] [ 1296s] lamb26 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 20 17:08:32 UTC 2019. [ 1296s] [ 1296s] ### VM INTERACTION START ### [ 1299s] [ 1255.945211] sysrq: SysRq : Power Off [ 1299s] [ 1256.014663] reboot: Power down [ 1299s] ### VM INTERACTION END ### [ 1299s] [ 1299s] lamb26 failed "build osmo-trx_1.1.1.dsc" at Fri Sep 20 17:08:35 UTC 2019. [ 1299s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 613s] ar: `u' modifier ignored since `D' is the default (see `U') [ 613s] libtool: link: ranlib .libs/libtransceiver_common.a [ 613s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 613s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 614s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 614s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 614s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 614s] collect2: error: ld returned 1 exit status [ 614s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 614s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 614s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 614s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 614s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 614s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 614s] make[1]: *** [Makefile:444: all] Error 2 [ 614s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 614s] dh_auto_build: make -j1 returned exit code 2 [ 614s] make: *** [debian/rules:6: build] Error 255 [ 614s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 614s] [ 614s] morla3 failed "build osmo-trx_1.1.1.25.2538.dsc" at Fri Sep 20 16:56:20 UTC 2019. [ 614s] [ 614s] ### VM INTERACTION START ### [ 617s] [ 592.531514] sysrq: SysRq : Power Off [ 617s] [ 592.586311] reboot: Power down [ 617s] ### VM INTERACTION END ### [ 617s] [ 617s] morla3 failed "build osmo-trx_1.1.1.25.2538.dsc" at Fri Sep 20 16:56:24 UTC 2019. [ 617s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-iuh[master]: asn1enum.pl: Make compatible with modern perl
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-iuh/+/15588
Change subject: asn1enum.pl: Make compatible with modern perl
..
asn1enum.pl: Make compatible with modern perl
This fixes the following error message:
Experimental keys on scalar is now forbidden at ./asn1enum.pl line 25.
Change-Id: I4680627acfd8f3ed73d32324fe0a54b554268f3b
---
M asn1/asn1enum.pl
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/88/15588/1
diff --git a/asn1/asn1enum.pl b/asn1/asn1enum.pl
index 8584e84..beac35f 100755
--- a/asn1/asn1enum.pl
+++ b/asn1/asn1enum.pl
@@ -22,7 +22,7 @@
next;
}
printf("%s ::= INTEGER {\n", $k);
- foreach my $r (sort { $a <=> $b } keys $h{$k}) {
+ foreach my $r (sort { $a <=> $b } keys %{$h{$k}}) {
printf("\t%s(%d),\n", $h{$k}{$r}, $r);
}
printf("}\n");
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15588
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I4680627acfd8f3ed73d32324fe0a54b554268f3b
Gerrit-Change-Number: 15588
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...osmo-iuh[master]: hnbgw: Add libosmoctrl's VTY CTRL command initialization
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15587 ) Change subject: hnbgw: Add libosmoctrl's VTY CTRL command initialization .. hnbgw: Add libosmoctrl's VTY CTRL command initialization Otherwise, the "ctrl" VTY node is not available and CTRL ip address cannot be set. Change-Id: I73f64b951690ec23f829c4855b2caeefa66ad35d --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hnbgw.c b/src/hnbgw.c index 3f94a01..9dc67a2 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -539,6 +539,7 @@ osmo_ss7_vty_init_asp(tall_hnb_ctx); osmo_sccp_vty_init(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); + ctrl_vty_init(tall_hnb_ctx); logging_vty_add_cmds(); /* Handle options after vty_init(), for --version */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I73f64b951690ec23f829c4855b2caeefa66ad35d Gerrit-Change-Number: 15587 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial TA
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410 ) Change subject: PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial TA .. Patch Set 9: I like the test case, but I think we shouldn't redefine acronyms that already have a meaning in the context of 3GPP specs/systems. "PRACH" is a specific logical channel, and we're not testing it here. We're testing a RACH for packet switched services, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I21f76ae723519c0eb54515922a05ca8045b00ade Gerrit-Change-Number: 15410 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:33:04 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 ) Change subject: PCU_Tests_RAW.ttcn: add test case for UL link quality adaptation .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia78d93e43a3c41b0b30e70df20a2da31077fd05f Gerrit-Change-Number: 15526 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:31:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: library/RLCMAC_CSN1_Types.ttcn: add UL Packet Resource Request
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15525 ) Change subject: library/RLCMAC_CSN1_Types.ttcn: add UL Packet Resource Request .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0d688beb4112d6db10ac89e2966b555e74887a6e Gerrit-Change-Number: 15525 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:26:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: library/PCUIF_CodecPort.ttcn: strip padding bytes from PCUIF_data
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15571 )
Change subject: library/PCUIF_CodecPort.ttcn: strip padding bytes from
PCUIF_data
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/#/c/15571/1/library/PCUIF_CodecPort.ttcn
File library/PCUIF_CodecPort.ttcn:
https://gerrit.osmocom.org/#/c/15571/1/library/PCUIF_CodecPort.ttcn@32
PS1, Line 32: for (var integer i := 0; i < data.len; i := i + 1) {
: res[i] := data.data[i];
: }
there is a builtin substring function called 'substr' which we use in various
places of osmo-ttcn3-hacks already. So please replace the above with "res :=
substr(data.data, 0, data.len)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15571
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibd698094c897d395208e80189457444a91018beb
Gerrit-Change-Number: 15571
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Comment-Date: Fri, 20 Sep 2019 15:26:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: hnbgw: Add libosmoctrl's VTY CTRL command initialization
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15587 ) Change subject: hnbgw: Add libosmoctrl's VTY CTRL command initialization .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I73f64b951690ec23f829c4855b2caeefa66ad35d Gerrit-Change-Number: 15587 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 20 Sep 2019 15:24:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel c...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15408 ) Change subject: bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel closed during WAIT_CC .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id1abf5ee44c60925b478123409f26bd29006202b Gerrit-Change-Number: 15408 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:23:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-iuh[master]: hnbgw: Add libosmoctrl's VTY CTRL command initialization
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15587 Change subject: hnbgw: Add libosmoctrl's VTY CTRL command initialization .. hnbgw: Add libosmoctrl's VTY CTRL command initialization Otherwise, the "ctrl" VTY node is not available and CTRL ip address cannot be set. Change-Id: I73f64b951690ec23f829c4855b2caeefa66ad35d --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/15587/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index 3f94a01..9dc67a2 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -539,6 +539,7 @@ osmo_ss7_vty_init_asp(tall_hnb_ctx); osmo_sccp_vty_init(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); + ctrl_vty_init(tall_hnb_ctx); logging_vty_add_cmds(); /* Handle options after vty_init(), for --version */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I73f64b951690ec23f829c4855b2caeefa66ad35d Gerrit-Change-Number: 15587 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...libosmocore[master]: logging: Move extern declaration of osmo_log_target_list from logging...
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15559 ) Change subject: logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h .. logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h This list is really not needed by applications and currently only used internally in logging.c and logging_vty.c. Change-Id: I5dca069512bfcd0826194427c5482fad8bfd0232 --- M include/osmocom/core/logging.h M include/osmocom/core/logging_internal.h 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index e56d3a5..1a2d60b 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -379,6 +379,5 @@ void log_del_target(struct log_target *target); struct log_target *log_target_find(int type, const char *fname); -extern struct llist_head osmo_log_target_list; /*! @} */ diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 01c96ce..2e65660 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -9,6 +9,7 @@ extern void *tall_log_ctx; extern struct log_info *osmo_log_info; extern const struct value_string loglevel_strs[]; +extern struct llist_head osmo_log_target_list; void assert_loginfo(const char *src); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5dca069512bfcd0826194427c5482fad8bfd0232 Gerrit-Change-Number: 15559 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-MessageType: merged
Change in ...libosmocore[master]: logging: Move extern declaration of osmo_log_target_list from logging...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15559 ) Change subject: logging: Move extern declaration of osmo_log_target_list from logging.h to logging_internal.h .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5dca069512bfcd0826194427c5482fad8bfd0232 Gerrit-Change-Number: 15559 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Fri, 20 Sep 2019 15:21:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: logging: Introduce mutex API to manage log_target in multi-thread envs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15560 ) Change subject: logging: Introduce mutex API to manage log_target in multi-thread envs .. Patch Set 5: Code-Review-1 I believe you need to introduce a library dependency to -lpthread as you're calling pthread functions. See http://git.osmocom.org/libosmocore/commit/?h=laforge/it_q&id=1d1fc137db5f309d28bfa300014e78d229fc26e5 for a not-yet-merged change of mine doing the same as it needs pthread -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7711893b34263baacac6caf4d489467053131bb Gerrit-Change-Number: 15560 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Fri, 20 Sep 2019 15:21:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: sgsn_libgtp.c: Drop use of deprecated libgtp APIs gtp_retrans*()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15579 ) Change subject: sgsn_libgtp.c: Drop use of deprecated libgtp APIs gtp_retrans*() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia9a93d4a6ed63cd0c736f9a99d81d730b958d82e Gerrit-Change-Number: 15579 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:12:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Introduce TODO-RELEASE file
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15578 ) Change subject: Introduce TODO-RELEASE file .. Introduce TODO-RELEASE file It's going to be useful to track new dependency APIs being used which require dependency version release and version bump during release of osmo-sgsn. Change-Id: Ia495a8577001c6a223c31f4ddd7eee289e3523c7 --- A TODO-RELEASE 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 000..1c5d61f --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1 @@ +#component whatdescription / commit summary line -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia495a8577001c6a223c31f4ddd7eee289e3523c7 Gerrit-Change-Number: 15578 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: Introduce TODO-RELEASE file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15578 ) Change subject: Introduce TODO-RELEASE file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ia495a8577001c6a223c31f4ddd7eee289e3523c7 Gerrit-Change-Number: 15578 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:11:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: update TODO-RELEASE for non-lib projects too
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15577 ) Change subject: osmo-release.sh: update TODO-RELEASE for non-lib projects too .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I409b7eb8c23d21473f25dd2000f5d4447b24adb9 Gerrit-Change-Number: 15577 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:11:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: update TODO-RELEASE for non-lib projects too
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15577 )
Change subject: osmo-release.sh: update TODO-RELEASE for non-lib projects too
..
osmo-release.sh: update TODO-RELEASE for non-lib projects too
Projects not containing libraries may also want to contain a
TODO-RELEASE in order to write down when a new API available only on
libosmoXYZ current master (hence configure.ac and debian cannot be
updated during the patch using the API until the APIs are available in a
new release). This way, during release process of the project, the
maintainer can see that a release of libosmoXYZ is needed beforehand and
then update configure.ac of project accordingly with the new version of
libosmoXYZ.
Furthermore, we want to update the file only if mode DRY_RUN is not
selected.
Change-Id: I409b7eb8c23d21473f25dd2000f5d4447b24adb9
---
M osmo-release.sh
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/osmo-release.sh b/osmo-release.sh
index 1effe7e..4450436 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -156,16 +156,18 @@
if [ "z$DRY_RUN" != "z0" ]; then
exit 0
fi
- if [ -f "TODO-RELEASE" ]; then
- grep '#' TODO-RELEASE > TODO-RELEASE.clean
- mv TODO-RELEASE.clean TODO-RELEASE
- git add TODO-RELEASE
- fi
fi
if [ "z$DRY_RUN" != "z0" ]; then
exit 0
fi
+
+if [ -f "TODO-RELEASE" ]; then
+ grep '#' TODO-RELEASE > TODO-RELEASE.clean
+ mv TODO-RELEASE.clean TODO-RELEASE
+ git add TODO-RELEASE
+fi
+
gbp dch --debian-tag='%(version)s' --auto --meta --git-author
--multimaint-merge --ignore-branch --new-version="$NEW_VER"
dch -r -m --distribution "unstable" ""
git add ${GIT_TOPDIR}/debian/changelog
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15577
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I409b7eb8c23d21473f25dd2000f5d4447b24adb9
Gerrit-Change-Number: 15577
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-mgw[master]: mgcp_test: Correctly release all endpoints allocated
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15580 )
Change subject: mgcp_test: Correctly release all endpoints allocated
..
mgcp_test: Correctly release all endpoints allocated
Currently in handle_create_con(), mgcp_conn_alloc() is called with NULl
ctx. As soon as this ctx is changed to be part of the trunk's endpoint
array (tcfg->endpoints), test will segfault because some fds from
previous tcfg are still registered after the whole tcfg object was freed
with talloc_free() by previous test. That's because
mgcp_endpoint_release() must be called on all endpoints to make sure all
registered components are correctly unplugged.
Related: OS#3950
Change-Id: I813d52b518ed0bb8db4e42dff83e040b0891fee2
---
M tests/mgcp/mgcp_test.c
1 file changed, 34 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index e5dec2a..c72382e 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -641,6 +641,13 @@
return real_clock_gettime(clk_id, tp);
}
+static void mgcp_endpoints_release(struct mgcp_trunk_config *trunk)
+{
+ int i;
+ for (i = 1; i < trunk->number_endpoints; i++)
+ mgcp_endp_release(&trunk->endpoints[i]);
+}
+
#define CONN_UNMODIFIED (0x1000)
static void test_values(void)
@@ -742,6 +749,7 @@
{
struct mgcp_config *cfg;
struct mgcp_endpoint *endp;
+ struct mgcp_trunk_config *trunk2;
int i;
struct mgcp_conn_rtp *conn = NULL;
char last_conn_id[256];
@@ -755,7 +763,8 @@
memset(last_conn_id, 0, sizeof(last_conn_id));
- mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
+ trunk2 = mgcp_trunk_alloc(cfg, 1);
+ mgcp_endpoints_allocate(trunk2);
for (i = 0; i < ARRAY_SIZE(tests); i++) {
const struct mgcp_test *t = &tests[i];
@@ -873,12 +882,15 @@
}
}
+ mgcp_endpoints_release(trunk2);
+ mgcp_endpoints_release(&cfg->trunk);
talloc_free(cfg);
}
static void test_retransmission(void)
{
struct mgcp_config *cfg;
+ struct mgcp_trunk_config *trunk2;
int i;
char last_conn_id[256];
int rc;
@@ -890,7 +902,8 @@
memset(last_conn_id, 0, sizeof(last_conn_id));
- mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
+ trunk2 = mgcp_trunk_alloc(cfg, 1);
+ mgcp_endpoints_allocate(trunk2);
for (i = 0; i < ARRAY_SIZE(retransmit); i++) {
const struct mgcp_test *t = &retransmit[i];
@@ -930,6 +943,8 @@
msgb_free(msg);
}
+ mgcp_endpoints_release(trunk2);
+ mgcp_endpoints_release(&cfg->trunk);
talloc_free(cfg);
}
@@ -943,6 +958,7 @@
static void test_rqnt_cb(void)
{
struct mgcp_config *cfg;
+ struct mgcp_trunk_config *trunk2;
struct msgb *inp, *msg;
char conn_id[256];
@@ -952,7 +968,8 @@
cfg->trunk.vty_number_endpoints = 64;
mgcp_endpoints_allocate(&cfg->trunk);
- mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
+ trunk2 = mgcp_trunk_alloc(cfg, 1);
+ mgcp_endpoints_allocate(trunk2);
inp = create_msg(CRCX, NULL);
msg = mgcp_handle_message(cfg, inp);
@@ -981,6 +998,8 @@
inp = create_msg(DLCX, conn_id);
msgb_free(mgcp_handle_message(cfg, inp));
msgb_free(inp);
+ mgcp_endpoints_release(trunk2);
+ mgcp_endpoints_release(&cfg->trunk);
talloc_free(cfg);
}
@@ -1342,12 +1361,12 @@
static void test_multilple_codec(void)
{
struct mgcp_config *cfg;
+ struct mgcp_trunk_config *trunk2;
struct mgcp_endpoint *endp;
struct msgb *inp, *resp;
struct in_addr addr;
struct mgcp_conn_rtp *conn = NULL;
char conn_id[256];
- int i;
printf("Testing multiple payload types\n");
@@ -1355,7 +1374,9 @@
cfg->trunk.vty_number_endpoints = 64;
mgcp_endpoints_allocate(&cfg->trunk);
cfg->policy_cb = mgcp_test_policy_cb;
- mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
+
+ trunk2 = mgcp_trunk_alloc(cfg, 1);
+ mgcp_endpoints_allocate(trunk2);
/* Allocate endpoint 1@mgw with two codecs */
last_endpoint = -1;
@@ -1481,9 +1502,8 @@
OSMO_ASSERT(conn);
OSMO_ASSERT(conn->end.codec->payload_type == 0);
- for (i = 1; i < cfg->trunk.number_endpoints; i++)
- mgcp_endp_release(&cfg->trunk.endpoints[i]);
-
+ mgcp_endpoints_release(trunk2);
+ mgcp_endpoints_release(&cfg->trunk);
talloc_free(cfg);
}
@@ -1532,12 +1552,13 @@
OSMO_ASSERT(conn->state.stats.cycles == UINT16_MAX + 1);
OSMO_ASSERT(conn->state.stats.max_seq == 0);
- mgcp_endp_release(endp);
+ mgcp_endpoints_release(&cfg->trunk);
Change in ...osmo-mgw[master]: mgw: Allocate mgcp_conn instance under tcfg->endpoints
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15581 )
Change subject: mgw: Allocate mgcp_conn instance under tcfg->endpoints
..
mgw: Allocate mgcp_conn instance under tcfg->endpoints
The connection becomes to the endpoint, so let's not use the NULL
context there.
Related: OS#3950
Change-Id: I6f6441c3ef21aac577af08eb018bacbca4c45fb7
---
M src/libosmo-mgcp/mgcp_protocol.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index b596044..c72596a 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -919,7 +919,7 @@
endp->callid = talloc_strdup(tcfg->endpoints, callid);
snprintf(conn_name, sizeof(conn_name), "%s", callid);
- _conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP, conn_name);
+ _conn = mgcp_conn_alloc(tcfg->endpoints, endp, MGCP_CONN_TYPE_RTP,
conn_name);
if (!_conn) {
LOGPENDP(endp, DLMGCP, LOGL_ERROR,
"CRCX: unable to allocate RTP connection\n");
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15581
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I6f6441c3ef21aac577af08eb018bacbca4c45fb7
Gerrit-Change-Number: 15581
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-mgw[master]: mgcp_test: Correctly release all endpoints allocated
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15580 ) Change subject: mgcp_test: Correctly release all endpoints allocated .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I813d52b518ed0bb8db4e42dff83e040b0891fee2 Gerrit-Change-Number: 15580 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:09:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-mgw[master]: mgw: Allocate mgcp_conn instance under tcfg->endpoints
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15581 ) Change subject: mgw: Allocate mgcp_conn instance under tcfg->endpoints .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6f6441c3ef21aac577af08eb018bacbca4c45fb7 Gerrit-Change-Number: 15581 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:10:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Atomically fetch and change underrun variable
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15524 ) Change subject: radioInterface: Atomically fetch and change underrun variable .. Patch Set 1: see e.g. https://github.com/php/php-src/blob/master/configure.ac#L706 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I684e0a5d2a9583a161d5a6593559b3a9e7cd57e3 Gerrit-Change-Number: 15524 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 20 Sep 2019 15:09:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Move multi-ARFCN chan amount modification from UHDDevice to parent class
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15542 ) Change subject: Move multi-ARFCN chan amount modification from UHDDevice to parent class .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I24d6c66bb3195ba2513b4a67daa14cdfbacdce6d Gerrit-Change-Number: 15542 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:07:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: radioInterface: Mark setRxGain as virtual
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15541 ) Change subject: radioInterface: Mark setRxGain as virtual .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie41efab1e60b88677bbd1ec333ea656794503a5a Gerrit-Change-Number: 15541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:07:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Transceiver: Fixed copying of history into and from channelizer buffer.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15413 ) Change subject: Transceiver: Fixed copying of history into and from channelizer buffer. .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I93e43f6868cd67e69fc59d2980a03550d2505bf8 Gerrit-Change-Number: 15413 Gerrit-PatchSet: 2 Gerrit-Owner: timojacobus Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: timojacobus Gerrit-Reviewer: tnt Gerrit-Comment-Date: Fri, 20 Sep 2019 15:06:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: logging_vty_add_cmds: Enforce no parameters
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15056 ) Change subject: vty: logging_vty_add_cmds: Enforce no parameters .. Patch Set 1: Code-Review-1 same here. what if somebody wants to build an application from 2016 against current libosmocore? All our efforts for compatibility exist to enable exactly that. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2fa8a9e2fdf3d55d0dcdb3d933ac5ceb48db3da9 Gerrit-Change-Number: 15056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:06:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: logging_vty_add_cmds: Enforce no parameters
laforge has removed a vote on this change. Change subject: vty: logging_vty_add_cmds: Enforce no parameters .. Removed Code-Review+1 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2fa8a9e2fdf3d55d0dcdb3d933ac5ceb48db3da9 Gerrit-Change-Number: 15056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote
Change in ...libosmocore[master]: vty: osmo_stats_vty_add_cmds: Enforce no parameters
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15055 ) Change subject: vty: osmo_stats_vty_add_cmds: Enforce no parameters .. Patch Set 1: Code-Review-1 Agreeing with osmith here. I don't really see why it would hurt if someone passed some arguments that are ignored... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b27824b83c2caad901cc910d77e634ed5562d6 Gerrit-Change-Number: 15055 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 20 Sep 2019 15:05:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: logging_vty_add_cmds: Enforce no parameters
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15056 ) Change subject: vty: logging_vty_add_cmds: Enforce no parameters .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2fa8a9e2fdf3d55d0dcdb3d933ac5ceb48db3da9 Gerrit-Change-Number: 15056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:04:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmo-netif[master]: stream_test: Use fake time
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15575 ) Change subject: stream_test: Use fake time .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I16b2884b289bfe40dfb8d743dce01bb4c208d117 Gerrit-Change-Number: 15575 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 20 Sep 2019 15:03:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmo-netif[master]: stream_test: Log fake time
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmo-netif/+/15576 )
Change subject: stream_test: Log fake time
..
stream_test: Log fake time
It allows easy verification that timing is correct and makes it easier
to debug time related race conditions.
Change-Id: I86eb1d7a8096011fd273f067255eb8d6484be65c
---
M tests/stream/stream_test.c
M tests/stream/stream_test.err
M tests/stream/stream_test.ok
3 files changed, 82 insertions(+), 66 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 4fd8573..b4846bc 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -57,8 +57,12 @@
#define ASTR(rec) ((rec) ? "autoreconnecting" : "non-reconnecting")
/* client defs */
-#define LOGCLI(cli, fmt, args...) \
- printf("[%s] Client's %s(): " fmt, osmo_stream_cli_get_data(cli) ? "OK"
: "NA", __func__, ##args)
+#define LOGCLI(cli, fmt, args...) do { \
+ struct timeval tv; \
+ osmo_gettimeofday(&tv, NULL); \
+ printf("{%lu.%06lu} [%s] Client's %s(): " fmt, tv.tv_sec,
tv.tv_usec, \
+ osmo_stream_cli_get_data(cli) ? "OK" : "NA", __func__,
##args); \
+ } while (0)
#define CLI_SND(cli, m) do { \
struct msgb *msg = make_msgb(m);\
@@ -228,9 +232,14 @@
#define LOGLNK(lnk, fmt, args...) \
printf("[%s] Server's %s(): " fmt, osmo_stream_srv_link_get_data(lnk) ?
"OK" : "NA", __func__, ##args)
-#define LOGSRV(srv, fmt, args...) \
- printf("[%s|%s] Server's %s(): " fmt, osmo_stream_srv_get_data(srv) ?
"OK" : "NA", \
- osmo_stream_srv_link_get_data(osmo_stream_srv_get_master(srv)) ?
"OK" : "NA", __func__, ##args)
+#define LOGSRV(srv, fmt, args...) do { \
+ struct timeval tv; \
+ osmo_gettimeofday(&tv, NULL); \
+ printf("{%lu.%06lu} [%s|%s] Server's %s(): " fmt, tv.tv_sec,
tv.tv_usec, \
+ osmo_stream_srv_get_data(srv) ? "OK" : "NA", \
+
osmo_stream_srv_link_get_data(osmo_stream_srv_get_master(srv)) ? "OK" : "NA", \
+ __func__, ##args); \
+ } while (0)
#define SRV_SND(srv, m) do { \
struct msgb *msg = make_msgb(m);\
@@ -322,6 +331,7 @@
static void test_recon(void *ctx, const char *host, unsigned port, unsigned
steps, struct osmo_stream_srv_link *lnk,
bool autoreconnect)
{
+ struct timeval tv;
struct osmo_stream_cli *cli = make_client(ctx, host, port,
autoreconnect);
if (!cli)
return;
@@ -333,20 +343,24 @@
osmo_stream_srv_link_set_data(lnk, ctx);
while(steps--) {
+ osmo_gettimeofday_override_add(0, 1); /* small increment to
easily spot iterations */
osmo_select_main(0);
- fprintf(stderr, "\n%s test step %u [client %s, server %s], FD
reg %u\n", ASTR(autoreconnect), steps,
+ osmo_gettimeofday(&tv, NULL);
+ fprintf(stderr, "\n{%lu.%06lu} %s test step %u [client %s,
server %s], FD reg %u\n",
+ tv.tv_sec, tv.tv_usec, ASTR(autoreconnect), steps,
osmo_stream_cli_get_data(cli) ? "OK" : "NA",
osmo_stream_srv_link_get_data(lnk) ? "OK" : "NA",
osmo_fd_is_registered(osmo_stream_cli_get_ofd(cli)));
if (test_stop_requested(lnk)) {
- printf("Server requested test termination\n");
+ printf("{%lu.%06lu} Server requested test
termination\n",
+ tv.tv_sec, tv.tv_usec);
steps = 0;
}
}
osmo_stream_cli_destroy(cli);
- printf("%s test complete.\n\n", ASTR(autoreconnect));
+ printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec,
ASTR(autoreconnect));
}
@@ -358,6 +372,8 @@
void *tall_test = talloc_named_const(NULL, 1, "osmo_stream_test");
osmo_gettimeofday_override = true;
+ osmo_gettimeofday_override_time.tv_sec = 2;
+ osmo_gettimeofday_override_time.tv_usec = 0;
msgb_talloc_ctx_init(tall_test, 0);
osmo_init_logging2(tall_test, &osmo_stream_test_log_info);
diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err
index 07cc7b0..04bfcfe 100644
--- a/tests/stream/stream_test.err
+++ b/tests/stream/stream_test.err
@@ -1,43 +1,43 @@
-autoreconnecting test step 11 [client NA, server OK], FD reg 1
+{2.01} autoreconnecting test step 11 [client NA, server OK], FD reg 1
-autoreconnecting test step 10 [cli
Change in ...libosmo-netif[master]: stream_test: Use fake time
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmo-netif/+/15575 )
Change subject: stream_test: Use fake time
..
stream_test: Use fake time
By using fake own-controlled time we get two benefits:
* Test doesn't take 9 seconds to run anymore
* More fine-grade control of different events happening (and associated
race conditions).
Change-Id: I16b2884b289bfe40dfb8d743dce01bb4c208d117
---
M tests/stream/stream_test.c
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index 439ea1a..4fd8573 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -19,9 +19,12 @@
#include
#include
#include
+#include
#include
+#define RECONNECT_TIMEOUT_SECS 9
+
#define DSTREAMTEST 0
struct log_info_cat osmo_stream_test_cat[] = {
[DSTREAMTEST] = {
@@ -100,6 +103,7 @@
/* N. B: normally receiving 0 bytes means that we should close
the connection and re-establish it
but to test autoreconnection logic we ignore it in here to
let the test run till completion */
LOGCLI(cli, "0-byte read, auto-reconnect will be triggered if
enabled\n");
+ osmo_gettimeofday_override_add(RECONNECT_TIMEOUT_SECS, 0);
}
if (!cli_data) {
@@ -116,7 +120,7 @@
static struct osmo_stream_cli *init_client_reconnection(struct osmo_stream_cli
*cli, bool autoreconnect)
{
/* setting negative timeout ensures that we disable reconnection logic
*/
- osmo_stream_cli_set_reconnect_timeout(cli, autoreconnect ? 9 : -1);
+ osmo_stream_cli_set_reconnect_timeout(cli, autoreconnect ?
RECONNECT_TIMEOUT_SECS : -1);
if (osmo_stream_cli_open(cli) < 0) {
LOGCLI(cli, "unable to open client\n");
@@ -352,6 +356,9 @@
char *host = "127.0.0.11";
unsigned port = ;
void *tall_test = talloc_named_const(NULL, 1, "osmo_stream_test");
+
+ osmo_gettimeofday_override = true;
+
msgb_talloc_ctx_init(tall_test, 0);
osmo_init_logging2(tall_test, &osmo_stream_test_log_info);
log_set_log_level(osmo_stderr_target, LOGL_INFO);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15575
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I16b2884b289bfe40dfb8d743dce01bb4c208d117
Gerrit-Change-Number: 15575
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in ...osmo-ci[master]: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15586 ) Change subject: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaad3e9f5b6b1966322abb89f54611a2368400dcb Gerrit-Change-Number: 15586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:02:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmo-netif[master]: stream_test: Log fake time
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15576 ) Change subject: stream_test: Log fake time .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I86eb1d7a8096011fd273f067255eb8d6484be65c Gerrit-Change-Number: 15576 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 20 Sep 2019 15:03:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ci/+/15586 ) Change subject: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases .. ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases Change-Id: Iaad3e9f5b6b1966322abb89f54611a2368400dcb --- M ansible/host_vars/osmo-gsm-tester-rnd.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ansible/host_vars/osmo-gsm-tester-rnd.yml b/ansible/host_vars/osmo-gsm-tester-rnd.yml index a9c7a24..331d5ba 100644 --- a/ansible/host_vars/osmo-gsm-tester-rnd.yml +++ b/ansible/host_vars/osmo-gsm-tester-rnd.yml @@ -2,6 +2,8 @@ udhcpd_static_leases: - mac: 00:02:95:00:41:b3 ip: 10.42.42.120 + - mac: 00:02:95:07:d1:2e +ip: 10.42.42.121 # how many modems are connected via a quadmodem? gsm_modems: 4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaad3e9f5b6b1966322abb89f54611a2368400dcb Gerrit-Change-Number: 15586 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...libosmocore[master]: ecu_fr: increase test coverage for FR ECU implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15574 ) Change subject: ecu_fr: increase test coverage for FR ECU implementation .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4 Gerrit-Change-Number: 15574 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 15:01:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15586 ) Change subject: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaad3e9f5b6b1966322abb89f54611a2368400dcb Gerrit-Change-Number: 15586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 20 Sep 2019 15:02:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: ecu_fr: increase test coverage for FR ECU implementation
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15574 )
Change subject: ecu_fr: increase test coverage for FR ECU implementation
..
ecu_fr: increase test coverage for FR ECU implementation
The ECU implementation for FR is currently tested by calling the related
functions directly and by using the generic ECU abstraction layer. However,
the test "test_fr_concealment" only tests directly. Lets add a version
that uses the generic ECU abstraction layer as well.
The generic ECU abstraction layer obsolets the public API functions
osmo_ecu_fr_reset() and osmo_ecu_fr_conceal(), lets tag those functions
as dprecated.
Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4
---
M include/osmocom/codec/ecu.h
M tests/codec/codec_ecu_fr_test.c
M tests/codec/codec_ecu_fr_test.ok
3 files changed, 88 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h
index 927ca0d..99b1430 100644
--- a/include/osmocom/codec/ecu.h
+++ b/include/osmocom/codec/ecu.h
@@ -11,8 +11,10 @@
uint8_t frame_backup[GSM_FR_BYTES];
};
-void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame);
-int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame);
+void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)
+ OSMO_DEPRECATED("Use generic ECU abstraction layer instead");
+int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)
+ OSMO_DEPRECATED("Use generic ECU abstraction layer instead");
enum osmo_ecu_codec {
OSMO_ECU_CODEC_HR,
diff --git a/tests/codec/codec_ecu_fr_test.c b/tests/codec/codec_ecu_fr_test.c
index 7ebc558..4040ce9 100644
--- a/tests/codec/codec_ecu_fr_test.c
+++ b/tests/codec/codec_ecu_fr_test.c
@@ -142,6 +142,46 @@
}
}
+/* Same as test_fr_concealment() but using generic core */
+void test_fr_concealment_core(void)
+{
+ struct osmo_ecu_state *state = osmo_ecu_init(NULL, OSMO_ECU_CODEC_FR);
+ uint8_t frame[GSM_FR_BYTES];
+ uint64_t xmaxc[4];
+ int i, rc;
+ int j = 0;
+
+ printf("=> Testing FR concealment (simple, consecutive bad frames)\n");
+
+ while (sample_frame_hex[j] != NULL) {
+ /* Parse frame from string to hex */
+ osmo_hexparse(sample_frame_hex[j], frame, GSM_FR_BYTES);
+ parse_xmaxc_frame(frame, xmaxc);
+ printf("Start with: %s, XMAXC: [%"PRIx64", %"PRIx64",
%"PRIx64", %"PRIx64"]\n",
+ sample_frame_hex[j], xmaxc[0], xmaxc[1], xmaxc[2],
xmaxc[3]);
+
+ /* Reset the ECU with the proposed known good frame */
+ osmo_ecu_frame_in(state, false, frame, GSM_FR_BYTES);
+
+ /* Now pretend that we do not receive any good frames anymore */
+ for (i = 0; i < 20; i++) {
+
+ rc = osmo_ecu_frame_out(state, frame);
+ OSMO_ASSERT(rc == GSM_FR_BYTES);
+ parse_xmaxc_frame(frame, xmaxc);
+
+ printf("conceal: %02i, result: %s XMAXC: [%"PRIx64",
%"PRIx64", %"PRIx64", %"PRIx64"]\n",
+ i, osmo_hexdump_nospc(frame, GSM_FR_BYTES),
+ xmaxc[0], xmaxc[1], xmaxc[2], xmaxc[3]);
+ }
+
+ /* Go to the next frame */
+ j++;
+ }
+
+ osmo_ecu_destroy(state);
+}
+
/* Simulate a real life situation: voice frames with a few dropouts */
void test_fr_concealment_realistic()
{
@@ -224,6 +264,7 @@
{
/* Perform actual tests */
test_fr_concealment();
+ test_fr_concealment_core();
test_fr_concealment_realistic();
test_fr_concealment_realistic_core();
diff --git a/tests/codec/codec_ecu_fr_test.ok b/tests/codec/codec_ecu_fr_test.ok
index 30163a9..d925e28 100644
--- a/tests/codec/codec_ecu_fr_test.ok
+++ b/tests/codec/codec_ecu_fr_test.ok
@@ -41,6 +41,49 @@
conceal: 17, result:
d0 XMAXC: [0,
0, 0, 0]
conceal: 18, result:
d0 XMAXC: [0,
0, 0, 0]
conceal: 19, result:
d0 XMAXC: [0,
0, 0, 0]
+=> Testing FR concealment (simple, consecutive bad frames)
+Start with:
d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da, XMAXC: [3f,
3f, 3f, 3f]
+conceal: 00, result:
d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da XMAXC: [3f,
3f, 3f, 3f]
+conceal: 01, result:
d9ec9be212901d802335598c501d805bad3d4ba01d809b69df5a501d809cd1b4da XMAXC: [3b,
3b, 3b, 3b]
+conceal: 02, result
Change in ...libosmocore[master]: ecu_fr: increase test coverage for FR ECU implementation
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15574 ) Change subject: ecu_fr: increase test coverage for FR ECU implementation .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4 Gerrit-Change-Number: 15574 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 11:34:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15586 Change subject: ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases .. ansible: gsm-tester-rnd: Add nano3g device to static IP DHCP leases Change-Id: Iaad3e9f5b6b1966322abb89f54611a2368400dcb --- M ansible/host_vars/osmo-gsm-tester-rnd.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/15586/1 diff --git a/ansible/host_vars/osmo-gsm-tester-rnd.yml b/ansible/host_vars/osmo-gsm-tester-rnd.yml index a9c7a24..331d5ba 100644 --- a/ansible/host_vars/osmo-gsm-tester-rnd.yml +++ b/ansible/host_vars/osmo-gsm-tester-rnd.yml @@ -2,6 +2,8 @@ udhcpd_static_leases: - mac: 00:02:95:00:41:b3 ip: 10.42.42.120 + - mac: 00:02:95:07:d1:2e +ip: 10.42.42.121 # how many modems are connected via a quadmodem? gsm_modems: 4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaad3e9f5b6b1966322abb89f54611a2368400dcb Gerrit-Change-Number: 15586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ci[master]: gerrit, master builds: build everything in docker
Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/15584 to look at the new patch set (#3). Change subject: gerrit, master builds: build everything in docker .. gerrit, master builds: build everything in docker Instead of building some projects in docker, and some directly on the build slave, build all of them in docker. This has several advantages: * build environment of master builds and gerrit verifications is the same, therefore the same build won't pass in gerrit and then fail in master * all build environments are volatile * no more conflicts while running VTY/CTRL tests Related: OS#3726, OS#3598 Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 59 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/15584/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35 Gerrit-Change-Number: 15584 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ci[master]: gerrit, master builds: add docker_{run, img} vars
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/15582 )
Change subject: gerrit, master builds: add docker_{run,img} vars
..
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15582
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518
Gerrit-Change-Number: 15582
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Fri, 20 Sep 2019 10:10:55 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-ci[master]: gerrit, master builds: make all jobs concurrent
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15585 ) Change subject: gerrit, master builds: make all jobs concurrent .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5fdf759faf47ec7e4f9cb2657bd004585a667add Gerrit-Change-Number: 15585 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 10:09:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: gerrit, master builds: build everything in docker
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15584 ) Change subject: gerrit, master builds: build everything in docker .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35 Gerrit-Change-Number: 15584 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 10:09:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: ecu_fr: increase test coverage for FR ECU implementation
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15574 ) Change subject: ecu_fr: increase test coverage for FR ECU implementation .. Patch Set 4: (1 comment) I was not aware that any application was using the direct API to the FR-ECU. I just thought that those function prototypes were only there to keep the unit-test code. I have now mared the API as OSMO_DEPRECATED and increased the test coverage a bit so that the generic ECU abstraction and the old direct function calls are tested equally. https://gerrit.osmocom.org/#/c/15574/3/include/osmocom/codec/ecu.h File include/osmocom/codec/ecu.h: https://gerrit.osmocom.org/#/c/15574/3/include/osmocom/codec/ecu.h@a14 PS3, Line 14: > Use OSMO_DEPRECATED() for that. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4 Gerrit-Change-Number: 15574 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 10:06:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in ...osmo-ci[master]: gerrit, master builds: add docker_{run, img} vars
Hello pespin, fixeria, daniel,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/15582
to look at the new patch set (#2).
Change subject: gerrit, master builds: add docker_{run,img} vars
..
gerrit, master builds: add docker_{run,img} vars
Move the common "docker run" invocation and image name into one place,
so it is not duplicated over and over. This prepares for changing the
image and building all Osmocom projects in docker (follow up patches).
Related: OS#3726
Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 57 insertions(+), 173 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/15582/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15582
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518
Gerrit-Change-Number: 15582
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: newpatchset
Change in ...osmo-ci[master]: gerrit, master builds: add docker_{run, img} vars
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/15582 )
Change subject: gerrit, master builds: add docker_{run,img} vars
..
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15582
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518
Gerrit-Change-Number: 15582
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Fri, 20 Sep 2019 10:06:28 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...libosmocore[master]: ecu_fr: increase test coverage for FR ECU implementation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15574 ) Change subject: ecu_fr: increase test coverage for FR ECU implementation .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4 Gerrit-Change-Number: 15574 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 20 Sep 2019 10:04:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ci[master]: gerrit, master builds: add docker_{run, img} vars
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/15582 )
Change subject: gerrit, master builds: add docker_{run,img} vars
..
Patch Set 1: Verified+1
* Verified, that all affected projects still build in gerrit-verification
* Verified, that osmo-bsc builds in master
* Assuming, that with above tests, all affected projects in master should not
break either (so I don't put too much time into this)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15582
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518
Gerrit-Change-Number: 15582
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Fri, 20 Sep 2019 10:03:25 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-ci[master]: gerrit, master builds: use stretch, not jessie
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15583 ) Change subject: gerrit, master builds: use stretch, not jessie .. Patch Set 1: Setting to WIP, because I need to verify/fix up all projects to build in docker with stretch. I had just tested locally with osmo-pcu, and while it builds properly, the address sanitizer fails as it runs the tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d Gerrit-Change-Number: 15583 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 20 Sep 2019 10:00:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ci[master]: gerrit, master builds: build everything in docker
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/15584
Change subject: gerrit, master builds: build everything in docker
..
gerrit, master builds: build everything in docker
Instead of building some projects in docker, and some directly on the
build slave, build all of them in docker.
This has several advantages:
* build environment of master builds and gerrit verifications is the
same, therefore the same build won't pass in gerrit and then fail in
master
* all build environments are volatile
* no more conflicts while running VTY/CTRL tests
Related: OS#3726, OS#3598
Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 59 insertions(+), 46 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/15584/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 3a74dd9..0b05e8b 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -37,7 +37,7 @@
-v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-v "$ARTIFACT_STORE:/artifact_store" \
docker_img: 'osmocom:deb9_amd64'
-cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
repos_url: 'ssh://jenk...@gerrit.osmocom.org:29418/{repos}'
gerrit_project: '{repos}'
@@ -47,20 +47,18 @@
- cellmgr-ng:
concurrent: true
- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- libasn1c
- libgtpnl
- libosmo-abis
- libosmo-netif
- - libosmo-sccp:
- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+ - libosmo-sccp
- libosmocore:
a1_name: arch
a1: !!python/tuple [arm-none-eabi, amd64]
combination_filter: '!(arch=="arm-none-eabi" &&
label=="FreeBSD_amd64")'
- cmd: './contrib/jenkins_arch.sh "$arch"'
+ cmd: '{docker_run} osmocom:amd64 /build/contrib/jenkins_arch.sh
"$arch"'
- libsmpp34
- libtelnet
@@ -84,11 +82,13 @@
- openggsn:
a1_name: GTP
a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]
- cmd: ./contrib/jenkins.sh
+ cmd: |
+{docker_run} \
+ -e GTP="$GTP" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- osmo-bsc:
concurrent: true
- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- osmo-bts:
a1_name: FIRMWARE_VERSION
@@ -108,7 +108,11 @@
(FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" &&
WITH_MANUALS == "0") ||
(FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS
== "0") ||
(FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" &&
WITH_MANUALS == "0")
- cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh
"$BTS_MODEL"'
+ cmd: |
+{docker_run} \
+ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ osmocom:amd64 /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"'
- osmo-ggsn:
a1_name: GTP
@@ -118,19 +122,18 @@
combination_filter: >
(GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||
(GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")
- cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+ cmd: |
+{docker_run} \
+ -e GTP="$GTP" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- osmo-gsm-manuals
-
- - osmo-hlr:
- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
-
- - osmo-iuh:
- cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
+ - osmo-hlr
+ - osmo-iuh
- osmo-mgw:
concurrent: true
- cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- osmo-msc:
a1_name: IU
@@ -193,8 +196,7 @@
-e WITH_MANUALS="$WITH_MANUALS" \
{docker_img} /build/contrib/jenkins.sh
- - osmo-sip-connector:
- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+ - osmo-sip-connector
- osmo-trx:
a1_name: INSTR
@@ -206,9 +208,13 @@
concurrent: true
combination_filter: >
(INSTR == "--with-sse" && WITH_MANUALS == "1")
+ cmd: |
+{docker_run} \
+ -e INSTR="$INSTR" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- - osmocom-bb:
- cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+ - osmocom-bb
- osmo-tetra
- osmo-sysmon
- osmo-remsim
d
Change in ...osmo-ci[master]: gerrit, master builds: make all jobs concurrent
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/15585
Change subject: gerrit, master builds: make all jobs concurrent
..
gerrit, master builds: make all jobs concurrent
Now that everything runs in docker, we don't need to worry about
problems with running VTY/CTRL tests in parallel.
Related: OS#3726
Change-Id: I5fdf759faf47ec7e4f9cb2657bd004585a667add
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 6 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/85/15585/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 0b05e8b..b821541 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -5,7 +5,7 @@
name: gerrit
# following default values can be overridden by each repo
disabled: false
-concurrent: false
+concurrent: true
node: osmocom-gerrit-debian8
# axes related defaults
slave_axis: !!python/tuple [osmocom-gerrit-debian9]
@@ -44,10 +44,7 @@
# in alphabetical order
repos:
- asn1c
-
- - cellmgr-ng:
- concurrent: true
-
+ - cellmgr-ng
- libasn1c
- libgtpnl
- libosmo-abis
@@ -71,7 +68,6 @@
a2: !!python/tuple [--enable-mgcp-transcoding,
--disable-mgcp-transcoding]
a3_name: IU
a3: !!python/tuple [--disable-iu]
- concurrent: true
cmd: |
{docker_run} \
-e IU="$IU" \
@@ -87,8 +83,7 @@
-e GTP="$GTP" \
osmocom:amd64 /build/contrib/jenkins.sh
- - osmo-bsc:
- concurrent: true
+ - osmo-bsc
- osmo-bts:
a1_name: FIRMWARE_VERSION
@@ -131,16 +126,13 @@
- osmo-gsm-manuals
- osmo-hlr
- osmo-iuh
-
- - osmo-mgw:
- concurrent: true
+ - osmo-mgw
- osmo-msc:
a1_name: IU
a1: !!python/tuple [--enable-iu, --disable-iu]
a2_name: WITH_MANUALS
a2: !!python/tuple ["1", "0"]
- concurrent: true
combination_filter: >
(IU == "--enable-iu" && WITH_MANUALS == "0") ||
(IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -161,7 +153,6 @@
a3: !!python/tuple [sysmo, lc15, oc2g, none]
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
- concurrent: true
combination_filter: >
(with_vty == "True" && with_dsp == "sysmo" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" &&
FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
@@ -186,7 +177,6 @@
a1: !!python/tuple [--enable-iu, --disable-iu]
a2_name: WITH_MANUALS
a2: !!python/tuple ["1", "0"]
- concurrent: true
combination_filter: >
(IU == "--enable-iu" && WITH_MANUALS == "0") ||
(IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -205,7 +195,6 @@
a1: !!python/tuple [--with-sse]
a2_name: WITH_MANUALS
a2: !!python/tuple ["1", "0"]
- concurrent: true
combination_filter: >
(INSTR == "--with-sse" && WITH_MANUALS == "1")
cmd: |
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index f952ac2..1604594 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -4,7 +4,7 @@
name: master_build
# following default values can be overridden by each repo
disabled: false
-concurrent: false
+concurrent: true
node: ''
# axes related defaults
slave_axis: !!python/tuple [osmocom-master-debian9]
@@ -162,7 +162,6 @@
a2: !!python/tuple [--enable-mgcp-transcoding,
--disable-mgcp-transcoding]
a3_name: IU
a3: !!python/tuple [--disable-iu]
- concurrent: true
cmd: |
{docker_run} \
-e IU="$IU" \
@@ -170,8 +169,7 @@
-e MGCP="$MGCP" \
{docker_img} /build/contrib/jenkins.sh
- - osmo-bsc:
- concurrent: true
+ - osmo-bsc
- osmo-bts:
a1_name: FIRMWARE_VERSION
@@ -232,7 +230,6 @@
master-osmo-sgsn
- osmo-mgw:
- concurrent: true
trigger: master-osmo-msc, master-osmo-bsc
- osmo-msc:
@@ -240,7 +237,6 @@
a1: !!python/tuple [--enable-iu, --disable-iu]
a2_name: WITH_MANUALS
a2: !!python/tuple ["1", "0"]
- concurrent: true
combination_filter: >
(IU == "--enable-iu" && WITH_MANUALS == "0") ||
(IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -266,7 +262,6 @@
a3: !!python/tuple [sysmo, lc15, none]
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
- concurrent: true
combinat
Change in ...osmo-ci[master]: gerrit, master builds: add docker_{run, img} vars
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/15582
Change subject: gerrit, master builds: add docker_{run,img} vars
..
gerrit, master builds: add docker_{run,img} vars
Move the common "docker run" invocation and image name into one place,
so it is not duplicated over and over. This prepares for changing the
image and building all Osmocom projects in docker (follow up patches).
Related: OS#3726
Change-Id: If529e6a93bb2227230981ee22f2c75bd0f1f4518
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 61 insertions(+), 177 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/15582/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index c5aae68..801c793 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -20,6 +20,23 @@
combination_filter: ''
sequential: false
# most common build invocation
+docker_run: |
+ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
+mkdir -p "$ARTIFACT_STORE"
+docker run --rm=true \
+ -e ARTIFACT_STORE=/artifact_store \
+ -e ASCIIDOC_WARNINGS_CHECK="1" \
+ -e HOME=/build \
+ -e JOB_NAME="$JOB_NAME" \
+ -e MAKE=make \
+ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+ -e PATH="$PATH:/build_bin" \
+ -e WITH_MANUALS="1" \
+ -w /build -i -u build \
+ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
+ -v "$ARTIFACT_STORE:/artifact_store" \
+docker_img: 'osmocom:amd64'
cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
repos_url: 'ssh://jenk...@gerrit.osmocom.org:29418/{repos}'
gerrit_project: '{repos}'
@@ -30,16 +47,7 @@
- cellmgr-ng:
concurrent: true
- cmd: |
-docker run --rm=true \
- -e HOME=/build \
- -e MAKE=make \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
- -e PATH="$PATH:/build_bin" \
- -w /build -i -u build \
- -v "$PWD:/build" \
- -v "$HOME/bin:/build_bin" \
- osmocom:amd64 /build/contrib/jenkins.sh
+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- libasn1c
- libgtpnl
@@ -67,26 +75,11 @@
a3: !!python/tuple [--disable-iu]
concurrent: true
cmd: |
-ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-mkdir -p "$ARTIFACT_STORE"
-docker run --rm=true \
- -e HOME=/build \
- -e ARTIFACT_STORE=/artifact_store \
- -e JOB_NAME="$JOB_NAME" \
- -e MAKE=make \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+{docker_run} \
-e IU="$IU" \
-e SMPP="$SMPP" \
-e MGCP="$MGCP" \
- -e PATH="$PATH:/build_bin" \
- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e WITH_MANUALS="1" \
- -e ASCIIDOC_WARNINGS_CHECK="1" \
- -w /build -i -u build \
- -v "$PWD:/build" \
- -v "$HOME/bin:/build_bin" \
- -v "$ARTIFACT_STORE:/artifact_store" \
- osmocom:amd64 /build/contrib/jenkins.sh
+ {docker_img} /build/contrib/jenkins.sh
- openggsn:
a1_name: GTP
@@ -95,18 +88,7 @@
- osmo-bsc:
concurrent: true
- cmd: |
-docker run --rm=true \
- -e HOME=/build \
- -e MAKE=make \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
- -e PATH="$PATH:/build_bin" \
- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e WITH_MANUALS="1" \
- -e ASCIIDOC_WARNINGS_CHECK="1" \
- -w /build -i -u build \
- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
- osmocom:amd64 /build/contrib/jenkins.sh
+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- osmo-bts:
a1_name: FIRMWARE_VERSION
@@ -148,18 +130,7 @@
- osmo-mgw:
concurrent: true
- cmd: |
-docker run --rm=true \
- -e HOME=/build \
- -e MAKE=make \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
- -e PATH="$PATH:/build_bin" \
- -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e WITH_MANUALS="1" \
- -e ASCIIDOC_WARNINGS_CHECK="1" \
- -w /build -i -u build \
- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
- osmocom:amd64 /build/contrib/jenkins.sh
+ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- osmo-msc:
a1_name: IU
@@ -171,23 +142,10 @@
(IU == "--enable-iu" && WITH_MA
Change in ...osmo-ci[master]: gerrit, master builds: use stretch, not jessie
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/15583
Change subject: gerrit, master builds: use stretch, not jessie
..
gerrit, master builds: use stretch, not jessie
Debian jessie (8) is EOL already, so switch to stretch (9). This is
required to build all Osmocom projects in docker, because at least
libosmocore fails to build with the old image (tests won't build out of
the box with GCC-4.9.x from jessie).
Do not build the jessie image anymore, and update the shared dockerfile.
Remove everything jessie specific, and make it work with stretch by
installing asciidoc-dblatex. Otherwise we get this error when building
manuals:
a2x: ERROR: missing configuration file:
/etc/asciidoc/dblatex/asciidoc-dblatex.xsl
I've tried to split this patch up into multiple ones, but since there is
no asciidoc-dblatex package in jessie, we must add the dependency and
switch the image at the same time.
Related: OS#3726
Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d
---
M docker/Dockerfile_osmocom_jenkins.amd64
M docker/rebuild_osmocom_jenkins_image.sh
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
4 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/15583/1
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64
b/docker/Dockerfile_osmocom_jenkins.amd64
index 3f499ad..897db15 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -1,10 +1,9 @@
-ARG DEBIAN_VERSION=jessie
+ARG DEBIAN_VERSION=stretch
FROM debian:${DEBIAN_VERSION}
RUN \
-echo "deb http://archive.debian.org/debian jessie-backports main" >>
/etc/apt/sources.list && \
dpkg --add-architecture i386 && \
-DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Check-Valid-Until=false
update && \
+DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
wget make
@@ -29,7 +28,7 @@
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev
libusb-1.0-0-dev libtalloc-dev libgnutls28-dev
# OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
gcc-arm-none-eabi liblua5.3-dev/jessie-backports
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
gcc-arm-none-eabi liblua5.3-dev
# building
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
libtool pkg-config automake autoconf
@@ -38,7 +37,7 @@
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
python3-setuptools python-setuptools python3-pip python-pip
# for osmo-gsm-manuals
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag
libxml2-utils
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag
libxml2-utils asciidoc-dblatex
# Linux kernel
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
diff --git a/docker/rebuild_osmocom_jenkins_image.sh
b/docker/rebuild_osmocom_jenkins_image.sh
index c4e3b10..60c516b 100755
--- a/docker/rebuild_osmocom_jenkins_image.sh
+++ b/docker/rebuild_osmocom_jenkins_image.sh
@@ -22,6 +22,5 @@
build_once "-t" "${tag_name}" "--build-arg"
DEBIAN_VERSION="${debian_version}"
}
-# Create containers using jessie (Debian 8.0) and stretch (Debian 9.0) as base.
-build_container osmocom:amd64 jessie
+# Create containers using stretch (Debian 9.0) as base.
build_container osmocom:deb9_amd64 stretch
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 801c793..3a74dd9 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -36,7 +36,7 @@
-w /build -i -u build \
-v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-v "$ARTIFACT_STORE:/artifact_store" \
-docker_img: 'osmocom:amd64'
+docker_img: 'osmocom:deb9_amd64'
cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
repos_url: 'ssh://jenk...@gerrit.osmocom.org:29418/{repos}'
gerrit_project: '{repos}'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index c0d25a6..c56f93f 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -37,7 +37,7 @@
-v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-v "$ARTIFACT_STORE:/artifact_store" \
-v "$HOME/.ssh:/home/build/.ssh:ro" \
-docker_img: 'osmocom:amd64'
+docker_img: 'osmocom:deb9_amd64'
cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
wrappers: []
trigger:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15583
To
Change in ...libosmocore[master]: ecu_fr: increase test coverage for FR ECU implementation
Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15574 to look at the new patch set (#4). Change subject: ecu_fr: increase test coverage for FR ECU implementation .. ecu_fr: increase test coverage for FR ECU implementation The ECU implementation for FR is currently tested by calling the related functions directly and by using the generic ECU abstraction layer. However, the test "test_fr_concealment" only tests directly. Lets add a version that uses the generic ECU abstraction layer as well. The generic ECU abstraction layer obsolets the public API functions osmo_ecu_fr_reset() and osmo_ecu_fr_conceal(), lets tag those functions as dprecated. Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4 --- M include/osmocom/codec/ecu.h M tests/codec/codec_ecu_fr_test.c M tests/codec/codec_ecu_fr_test.ok 3 files changed, 88 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/15574/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0c8a9b164f14ea4fa00688f760a76cdb4890af4 Gerrit-Change-Number: 15574 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: cosmetic: Add comment on GSM-FR ECU struct
dexter has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15573 )
Change subject: cosmetic: Add comment on GSM-FR ECU struct
..
cosmetic: Add comment on GSM-FR ECU struct
Change-Id: Ic0a3a407c592262104af315f845f0bbd116ab26b
---
M include/osmocom/codec/ecu.h
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h
index f3b34c9..927ca0d 100644
--- a/include/osmocom/codec/ecu.h
+++ b/include/osmocom/codec/ecu.h
@@ -5,6 +5,7 @@
#include
+/* ECU state for GSM-FR */
struct osmo_ecu_fr_state {
bool subsequent_lost_frame;
uint8_t frame_backup[GSM_FR_BYTES];
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15573
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic0a3a407c592262104af315f845f0bbd116ab26b
Gerrit-Change-Number: 15573
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmocore[master]: cosmetic: Move comment to the right place
dexter has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15572 )
Change subject: cosmetic: Move comment to the right place
..
cosmetic: Move comment to the right place
Change-Id: I3d548fcc7d500baf37134b14af91bc7b284ce6ad
---
M include/osmocom/codec/ecu.h
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/codec/ecu.h b/include/osmocom/codec/ecu.h
index ec94670..f3b34c9 100644
--- a/include/osmocom/codec/ecu.h
+++ b/include/osmocom/codec/ecu.h
@@ -5,7 +5,6 @@
#include
-/* Codec independent ECU state */
struct osmo_ecu_fr_state {
bool subsequent_lost_frame;
uint8_t frame_backup[GSM_FR_BYTES];
@@ -40,6 +39,7 @@
* -- Harald Welte on August 1, 2019.
*/
+/* Codec independent ECU state */
struct osmo_ecu_state {
enum osmo_ecu_codec codec;
uint8_t data[0];
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15572
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I3d548fcc7d500baf37134b14af91bc7b284ce6ad
Gerrit-Change-Number: 15572
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
