Change in osmo-bsc[master]: hodec2: to balance congestion, use overload percent
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/22085 )
Change subject: hodec2: to balance congestion, use overload percent
..
hodec2: to balance congestion, use overload percent
For balancing load across congested cells and across congested TCH/*
kinds, instead of comparing the number of lchans above the configured
congestion threshold, compare the percent of lchans of overload.
In short, using a percentage prevents cells with less min-free-slots to
fill up 100% while neighbor cells still may have several free lchans
available.
An obvious example of why this is desirable is illustrated by
test_balance_congestion_by_percentage.ho_vty:
Cell A has min-free-slots 2, and has all slots occupied.
Cell B has min-free-slots 4, and has 2 slots remaining free.
If we count congested lchans as in current master: cell A has a
congestion count of 2: two more lchans in use than "allowed". If we move
one lchan over to cell B, it ends up with a congestion count of 3, which
is worse than 2. So when counting lchans, we decide that cell A should
remain full.
Instead, when comparing percentage of remaining lchans, we would see
that cell A is loaded 100% above congestion (2 of 2 remaining lchans in
use), but when moving one lchan to cell B, that would only be 75% loaded
above its treshold (3 of 4 remaining lchans in use). So a percentage
comparison would cause a handover to cell B.
Related: SYS#5259
Change-Id: I55234c6c99eb02ceee52be0d7388bea14304930f
---
M doc/manuals/chapters/handover.adoc
M src/osmo-bsc/handover_decision_2.c
M tests/handover/test_balance_congestion_by_percentage.ho_vty
M tests/handover/test_balance_congestion_tchf_tchh.ho_vty
4 files changed, 57 insertions(+), 23 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/doc/manuals/chapters/handover.adoc
b/doc/manuals/chapters/handover.adoc
index 4de744b..56e9aea 100644
--- a/doc/manuals/chapters/handover.adoc
+++ b/doc/manuals/chapters/handover.adoc
@@ -511,9 +511,11 @@
cells. Every time, the one MS that will suffer the least RXLEV loss while still
reducing congestion will be instructed to move first.
-If a cell and its neighbors are all loaded past their `min-free-slots`
-settings, the algorithmic aim is equal load: a load-based handover will never
-cause the target cell to be more congested than the source cell.
+If a cell and its neighbors are all loaded past their `min-free-slots`
settings,
+the algorithmic aim is to improve the percentage of load above the
+`min-free-slots` setting: a load-based handover always requires the target cell
+to have a lower load percentage after handover than the source cell had before
+handover.
The min-free-slots setting is a tradeoff between immediate voice service
availability and optimal reception levels. A sane choice could be:
diff --git a/src/osmo-bsc/handover_decision_2.c
b/src/osmo-bsc/handover_decision_2.c
index c265f5f..0362c9b 100644
--- a/src/osmo-bsc/handover_decision_2.c
+++ b/src/osmo-bsc/handover_decision_2.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -387,6 +388,26 @@
return false;
}
+#define LOAD_PRECISION 6
+
+/* Return a number representing overload, i.e. the fraction of lchans used
above the congestion threshold.
+ * Think of it as a percentage of used lchans above congestion, just
represented in a fixed-point fraction with N
+ * decimal digits of fractional part. If there is no congestion (free_tch >=
min_free_tch), return 0.
+ */
+static int32_t load_above_congestion(int free_tch, int min_free_tch)
+{
+ int32_t v;
+ OSMO_ASSERT(free_tch >= 0);
+ /* Avoid division by zero when no congestion threshold is set, and
return zero overload when there is no
+* congestion. */
+ if (free_tch >= min_free_tch)
+ return 0;
+ v = min_free_tch - free_tch;
+ v *= pow(10, LOAD_PRECISION);
+ v /= min_free_tch;
+ return v;
+}
+
/*
* Check what requirements the given cell fulfills.
* A bit mask of fulfilled requirements is returned.
@@ -443,7 +464,7 @@
{
uint8_t requirement = 0;
unsigned int penalty_time;
- int current_overbooked;
+ int32_t current_overbooked;
c->requirements = 0;
/* Requirement A */
@@ -626,17 +647,25 @@
/* Requirement C */
- /* the nr of lchans surpassing congestion on the target cell must be <=
the lchans surpassing congestion on the
-* current cell _after_ handover/assignment */
- current_overbooked = c->current.min_free_tch - c->current.free_tch;
+ /* the load percentage above congestion on the target cell *after* HO
must be < the load percentage above
+* congestion on the current cell, hence the - 1 on
Change in osmo-bsc[master]: handover_test: enhance test_balance_congestion_by_percentage.ho_vty
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22101 ) Change subject: handover_test: enhance test_balance_congestion_by_percentage.ho_vty .. handover_test: enhance test_balance_congestion_by_percentage.ho_vty Related: SYS#5259 Change-Id: I2664dd0857965c4dbf1f91e57c6324d9cf330423 --- M tests/handover/test_balance_congestion_by_percentage.ho_vty 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/handover/test_balance_congestion_by_percentage.ho_vty b/tests/handover/test_balance_congestion_by_percentage.ho_vty index 09d2151..aba7d3a 100644 --- a/tests/handover/test_balance_congestion_by_percentage.ho_vty +++ b/tests/handover/test_balance_congestion_by_percentage.ho_vty @@ -33,3 +33,20 @@ # 1 is performed. congestion-check expect-ho from lchan 0 0 1 0 to lchan 1 0 5 0 + + +# Make sure that no percentage based handover merely reverses the situation between two cells: + +network + bts 0 + handover2 min-free-slots tch/f 4 + bts 1 + handover2 min-free-slots tch/f 4 + +set-ts-use trx 0 0 states*TCH/F TCH/F TCH/F TCH/F - - * +set-ts-use trx 1 0 states*TCH/F TCH/F TCH/F - - - * + +# the condition is false: target_overbooked_after_ho==50% < current_overbooked_before_ho==50%, so no congestion +# balancing is performed. +congestion-check +expect-no-chan -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2664dd0857965c4dbf1f91e57c6324d9cf330423 Gerrit-Change-Number: 22101 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: hodec2: to balance congestion, use overload percent
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22085 ) Change subject: hodec2: to balance congestion, use overload percent .. Patch Set 6: Code-Review+2 combine +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55234c6c99eb02ceee52be0d7388bea14304930f Gerrit-Change-Number: 22085 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Jan 2021 06:21:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud135:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-gsm-manuals in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Raspbian_10/armv7l Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-sgsn in openSUSE_Leap_15.1/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb07:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 48s] CC net_init.o [ 48s] CC nm_common_fsm.o [ 48s] CC nm_bb_transc_fsm.o [ 48s] neighbor_ident_vty.c: In function 'cfg_neighbor_bind': [ 48s] neighbor_ident_vty.c:591:28: error: 'OSMO_CTRL_PORT_BSC_NEIGH' undeclared (first use in this function); did you mean 'OSMO_CTRL_PORT_BSC_NAT'? [ 48s] 591 | g_net->neigh_ctrl.port = OSMO_CTRL_PORT_BSC_NEIGH; [ 48s] |^~~~ [ 48s] |OSMO_CTRL_PORT_BSC_NAT [ 48s] neighbor_ident_vty.c:591:28: note: each undeclared identifier is reported only once for each function it appears in [ 48s] make[3]: *** [Makefile:708: neighbor_ident_vty.o] Error 1 [ 48s] make[3]: *** Waiting for unfinished jobs [ 49s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-bsc-1.6.0.507.55a01/src/osmo-bsc' [ 49s] make[2]: *** [Makefile:404: all-recursive] Error 1 [ 49s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-bsc-1.6.0.507.55a01/src' [ 49s] make[1]: *** [Makefile:454: all-recursive] Error 1 [ 49s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-bsc-1.6.0.507.55a01' [ 49s] make: *** [Makefile:386: all] Error 2 [ 49s] error: Bad exit status from /var/tmp/rpm-tmp.oZ0LCW (%build) [ 49s] [ 49s] [ 49s] RPM build errors: [ 49s] Bad exit status from /var/tmp/rpm-tmp.oZ0LCW (%build) [ 49s] ### VM INTERACTION START ### [ 52s] [ 43.684690] sysrq: Power Off [ 52s] [ 43.691407] reboot: Power down [ 52s] ### VM INTERACTION END ### [ 52s] [ 52s] lamb16 failed "build osmo-bsc.spec" at Thu Jan 14 03:12:53 UTC 2021. [ 52s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bsc[master]: vty: fix 'codec-list' command: check all given arguments first
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/22167 )
Change subject: vty: fix 'codec-list' command: check all given arguments first
..
vty: fix 'codec-list' command: check all given arguments first
Allocating a new list of supported codecs *before* checking the
command arguments is a bad idea. The operator may simply mistype
one of the codecs and will end up with a list of NULL pointers.
The functions calling audio_support_to_gsm88() assume that this
list always does contain valid pointers, so if a new subscriber
connection gets established, or the operator simply invokes
'show running-config', osmo-bsc would crash due to NULL pointer
dereference.
Steps to reproduce:
1. In the VTY, do: 'en' -> 'configure terminal' -> 'msc';
2. Configure any invalid codec list, e.g. 'codec-list Boom!';
3. Invoke 'show running-config', boom!
Let's check the input before changing the internal structures.
Change-Id: I35b740a39c9cf3716d286e717486ef505bc61522
Fixes: OS#4946
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/22167/1
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 400e1a6..fb9083b 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -6825,6 +6825,17 @@
struct bsc_msc_data *data = bsc_msc_data(vty);
int i;
+ /* check all given arguments first */
+ for (i = 0; i < argc; ++i) {
+ /* check for hrX or frX */
+ if (strlen(argv[i]) != 3
+ || argv[i][1] != 'r'
+ || (argv[i][0] != 'h' && argv[i][0] != 'f')
+ || argv[i][2] < 0x30
+ || argv[i][2] > 0x39)
+ goto error;
+ }
+
/* free the old list... if it exists */
if (data->audio_support) {
talloc_free(data->audio_support);
@@ -6838,14 +6849,6 @@
data->audio_length = argc;
for (i = 0; i < argc; ++i) {
- /* check for hrX or frX */
- if (strlen(argv[i]) != 3
- || argv[i][1] != 'r'
- || (argv[i][0] != 'h' && argv[i][0] != 'f')
- || argv[i][2] < 0x30
- || argv[i][2] > 0x39)
- goto error;
-
data->audio_support[i] = talloc_zero(data->audio_support,
struct gsm_audio_support);
data->audio_support[i]->ver = atoi(argv[i] + 2);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22167
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I35b740a39c9cf3716d286e717486ef505bc61522
Gerrit-Change-Number: 22167
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/osmo-hlr in openSUSE_Factory_ARM/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was obs-arm-6:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-smlc in Debian_8.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-smlc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-smlc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-smlc Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud107:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 185s] [COMPILING apps/dfu/main.c] [ 185s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 185s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 185s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 186s] Memory region Used Size Region Size %age Used [ 186s] rom: 16580 B16 KB101.20% [ 186s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 186s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 186s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 186s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 186s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 186s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 186s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 186s] collect2: error: ld returned 1 exit status [ 186s] % [ 186s] make[2]: *** [Makefile:234: flash] Error 1 [ 186s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 186s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 186s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 186s] dh_auto_build: error: make -j1 returned exit code 2 [ 186s] make: *** [debian/rules:16: build] Error 25 [ 186s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 186s] ### VM INTERACTION START ### [ 189s] [ 165.317977] sysrq: Power Off [ 189s] [ 165.327244] reboot: Power down [ 189s] ### VM INTERACTION END ### [ 189s] [ 189s] cloud117 failed "build simtrace2_0.7.0.69.aadd.dsc" at Thu Jan 14 01:59:46 UTC 2021. [ 189s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 109s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 109s] [COMPILING libboard/qmod/source/card_pres.c] [ 109s] [COMPILING libboard/qmod/source/wwan_led.c] [ 109s] [COMPILING libboard/qmod/source/i2c.c] [ 110s] [COMPILING libboard/qmod/source/board_qmod.c] [ 110s] [COMPILING apps/dfu/main.c] [ 110s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 110s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 110s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 110s] Memory region Used Size Region Size %age Used [ 110s] rom: 16588 B16 KB101.25% [ 110s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 110s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 110s] collect2: error: ld returned 1 exit status [ 110s] % [ 110s] make[2]: *** [Makefile:234: flash] Error 1 [ 110s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 110s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 110s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 110s] dh_auto_build: error: make -j1 returned exit code 2 [ 110s] make: *** [debian/rules:16: build] Error 25 [ 110s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 110s] ### VM INTERACTION START ### [ 113s] [ 105.505230] sysrq: Power Off [ 113s] [ 105.506786] reboot: Power down [ 113s] ### VM INTERACTION END ### [ 113s] [ 113s] build82 failed "build simtrace2_0.7.0.69.aadd.dsc" at Thu Jan 14 01:58:27 UTC 2021. [ 113s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was goat11:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in Debian_10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_10/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud128:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-fl2k in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb23:11) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-python-tests in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was lamb54:3) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: getoldpackages: connect to back-other-opensuse:5253: Connection timed out (worker was cloud137:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bts[master]: power_control: do not print BS power parameters for C0/TRX0
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22166 )
Change subject: power_control: do not print BS power parameters for C0/TRX0
..
power_control: do not print BS power parameters for C0/TRX0
BS power control is *not* allowed on C0/TRX, so the L1SAP layer
would not even feed the BS power loop with Downlink measurement
reports coming from the MS (see [1]). Although, the VTY would
still show BS power parameters for C0/TRX:
OsmoBTS# show lchan
BTS 0, TRX 0, Timeslot 1, Lchan 0: Type SDCCH
...
BS (Downlink) Power Control (static mode):
Channel reduction: 6 dB
TRX reduction: 10 dB
Actual / Nominal power: -3 dBm / 13 dBm
This is extremely confusing, especially the last line showing that
the attenuation value is currently applied, despite it's not.
Let's do not print BS power control information for C0/TRX0, even
if the BSC has sent them in the channel activation message [2].
[1] I4fdfe097ae6f9edde5f39ed4da8a559a14b3b38f
[2] If8507992dfd90ade1edda99b72bf2420a702ccd5
Change-Id: I51b2def8c752215d1b89a6bbfb15c49db27e
Related: SYS#4918
---
M src/common/vty.c
1 file changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/22166/1
diff --git a/src/common/vty.c b/src/common/vty.c
index 689ae58..01578e7 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1292,11 +1292,14 @@
trx->nominal_power, trx->max_power_red,
trx->nominal_power - trx->max_power_red, VTY_NEWLINE);
- vty_out(vty, " BS Power control parameters (%s):%s",
- trx->bs_dpc_params == &trx->bts->bs_dpc_params ?
- "fall-back" : "from BSC",
- VTY_NEWLINE);
- dump_dpc_params(vty, 4, trx->bs_dpc_params);
+ /* BS power control shall not be used on C0/TRX0 */
+ if (trx->bts->c0 != trx) {
+ vty_out(vty, " BS Power control parameters (%s):%s",
+ trx->bs_dpc_params == &trx->bts->bs_dpc_params ?
+ "fall-back" : "from BSC",
+ VTY_NEWLINE);
+ dump_dpc_params(vty, 4, trx->bs_dpc_params);
+ }
vty_out(vty, " MS Power control parameters (%s):%s",
trx->ms_dpc_params == &trx->bts->ms_dpc_params ?
@@ -1489,6 +1492,10 @@
const struct lchan_power_ctrl_state *st = &lchan->bs_power_ctrl;
const struct gsm_bts_trx *trx = lchan->ts->trx;
+ /* BS power control shall not be used on C0/TRX0 */
+ if (trx == trx->bts->c0)
+ return;
+
cfg_out(vty, "BS (Downlink) Power Control (%s mode):%s",
st->dpc_params ? "dynamic" : "static", VTY_NEWLINE);
indent += 2;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22166
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I51b2def8c752215d1b89a6bbfb15c49db27e
Gerrit-Change-Number: 22166
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: power_control: do not send BS Power IEs for channels on C0/TRX0
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22165 ) Change subject: power_control: do not send BS Power IEs for channels on C0/TRX0 .. power_control: do not send BS Power IEs for channels on C0/TRX0 Reducing transmit power on C0/TRX0 is not permitted in GSM (there are some energy saving enhancements though), so the BSC shall not be sending any BS Power IEs when allocating channels there. Change-Id: If8507992dfd90ade1edda99b72bf2420a702ccd5 Related: SYS#4918 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/22165/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 2142219..e3270a7 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -597,14 +597,16 @@ } if (bts->bs_power_ctrl.mode != GSM_PWR_CTRL_MODE_NONE) - msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power); + if (trx != bts->c0) /* BS power control is not allowed on C0/TRX0 */ + msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power); if (bts->ms_power_ctrl.mode != GSM_PWR_CTRL_MODE_NONE) msgb_tv_put(msg, RSL_IE_MS_POWER, lchan->ms_power); msgb_tv_put(msg, RSL_IE_TIMING_ADVANCE, ta); /* BS/MS Power Control Parameters (if supported by BTS model) */ - add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan); + if (trx != bts->c0) /* BS power control is not allowed on C0/TRX0 */ + add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan); add_power_control_params(msg, RSL_IE_MS_POWER_PARAM, lchan); mr_config_for_bts(lchan, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If8507992dfd90ade1edda99b72bf2420a702ccd5 Gerrit-Change-Number: 22165 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bsc[master]: vty: fix writing empty IP address for unconfigured NSVCs
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/22164 ) Change subject: vty: fix writing empty IP address for unconfigured NSVCs .. vty: fix writing empty IP address for unconfigured NSVCs config_write_bts_gprs() currently writes the remote address of an NSVC even if osmo_sockaddr_str_from_sockaddr() returns non-zero code. Thus saving a configuration with only one configured NSVC to a file would produce the following: bts N ... gprs nsvc 0 nsvci 101 gprs nsvc 0 local udp port 23023 gprs nsvc 0 remote ip 127.0.0.1 gprs nsvc 0 remote udp port 23000 gprs nsvc 1 nsvci 0 gprs nsvc 1 local udp port 0 gprs nsvc 1 remote ip and next time osmo-bsc would refuse to start due to: Error occurred during reading the below line: gprs nsvc 1 remote ip The related condition consists of the following two parts: - checking if osmo_sockaddr_str_from_sockaddr() != 0; - checking if 'remote.af != AF_UNSPEC'. The first one is wrong, because osmo_sockaddr_str_from_sockaddr(), like many other functions, returns 0 on success. Let's fix this. After the fix, the second part does not seem to make sense, because remote.af would remain AF_UNSPEC (0) if the function call succeeds. Printing the remote port alone does not make sense, let's avoid printing it if the address cannot be parsed into a string. Change-Id: I5d6cbde4f605c8184db4ade87de5644a849c05db Fixes: I621360cab1e12c22248e33d62a9929995053ce04 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/22164/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5d6cbde4f605c8184db4ade87de5644a849c05db Gerrit-Change-Number: 22164 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: vty: fix writing empty IP address for unconfigured NSVC
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/22164 )
Change subject: vty: fix writing empty IP address for unconfigured NSVC
..
vty: fix writing empty IP address for unconfigured NSVC
config_write_bts_gprs() currently writes the remote address of an
NSVC even if osmo_sockaddr_str_from_sockaddr() returns non-zero
code. Thus saving a configuration with only one configured NSVC
to a file would produce the following:
bts N
...
gprs nsvc 0 nsvci 101
gprs nsvc 0 local udp port 23023
gprs nsvc 0 remote ip 127.0.0.1
gprs nsvc 0 remote udp port 23000
gprs nsvc 1 nsvci 0
gprs nsvc 1 local udp port 0
gprs nsvc 1 remote ip
and next time osmo-bsc would refuse to start due to:
Error occurred during reading the below line:
gprs nsvc 1 remote ip
The related condition consists of the following two parts:
- checking if osmo_sockaddr_str_from_sockaddr() != 0;
- checking if 'remote.af != AF_UNSPEC'.
The first one is wrong, because osmo_sockaddr_str_from_sockaddr(),
like many other functions, returns 0 on success. Let's fix this.
After the fix, the second part does not seem to make sense, because
remote.af would remain AF_UNSPEC (0) if the function call succeeds.
Printing the remote port alone does not make sense, let's avoid
printing it if the address cannot be parsed into a string.
Change-Id: I5d6cbde4f605c8184db4ade87de5644a849c05db
Fixes: I621360cab1e12c22248e33d62a9929995053ce04
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 9 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/22164/1
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 91acb03..753acf7 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -772,8 +772,7 @@
bts_sm->gprs.nse.timer[i], VTY_NEWLINE);
for (i = 0; i < ARRAY_SIZE(bts_sm->gprs.nsvc); i++) {
const struct gsm_gprs_nsvc *nsvc = &bts_sm->gprs.nsvc[i];
- struct osmo_sockaddr_str remote = {};
- uint16_t port;
+ struct osmo_sockaddr_str remote;
vty_out(vty, " gprs nsvc %u nsvci %u%s", i,
nsvc->nsvci, VTY_NEWLINE);
@@ -781,18 +780,15 @@
vty_out(vty, " gprs nsvc %u local udp port %u%s", i,
nsvc->local_port, VTY_NEWLINE);
- if (osmo_sockaddr_str_from_sockaddr(&remote,
&nsvc->remote.u.sas) ||
- remote.af != AF_UNSPEC) {
- vty_out(vty, " gprs nsvc %u remote ip %s%s", i,
- remote.ip, VTY_NEWLINE);
- }
+ /* Most likely, the remote address is not configured
(AF_UNSPEC).
+* Printing the port alone makes no sense, so let's just skip
both. */
+ if (osmo_sockaddr_str_from_sockaddr(&remote,
&nsvc->remote.u.sas) != 0)
+ continue;
- /* Can't use remote.port because it's only valid when family !=
AF_UNSPEC, but the
-* port can be even configured when the IP isn't */
- port = osmo_htons(nsvc->remote.u.sin.sin_port);
- if (port)
- vty_out(vty, " gprs nsvc %u remote udp port %u%s", i,
- port, VTY_NEWLINE);
+ vty_out(vty, " gprs nsvc %u remote ip %s%s",
+ i, remote.ip, VTY_NEWLINE);
+ vty_out(vty, " gprs nsvc %u remote udp port %u%s",
+ i, remote.port, VTY_NEWLINE);
}
/* EGPRS specific parameters */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22164
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5d6cbde4f605c8184db4ade87de5644a849c05db
Gerrit-Change-Number: 22164
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: vty: use 'const' for *nsvc in config_write_bts_gprs()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/22163 )
Change subject: vty: use 'const' for *nsvc in config_write_bts_gprs()
..
vty: use 'const' for *nsvc in config_write_bts_gprs()
Change-Id: I869944cc692c7954b2862ecff32c6034d20babef
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/22163/1
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 400e1a6..91acb03 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -771,8 +771,7 @@
get_value_string(gprs_ns_timer_strs, i),
bts_sm->gprs.nse.timer[i], VTY_NEWLINE);
for (i = 0; i < ARRAY_SIZE(bts_sm->gprs.nsvc); i++) {
- struct gsm_gprs_nsvc *nsvc =
- &bts_sm->gprs.nsvc[i];
+ const struct gsm_gprs_nsvc *nsvc = &bts_sm->gprs.nsvc[i];
struct osmo_sockaddr_str remote = {};
uint16_t port;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22163
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I869944cc692c7954b2862ecff32c6034d20babef
Gerrit-Change-Number: 22163
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: Introduce Neighbor Resolution Service
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21848 ) Change subject: Introduce Neighbor Resolution Service .. Introduce Neighbor Resolution Service This new CTRL interface allows users of this BSC (such as attached PCU) to gather neighbor information. This interface is needed for PCU to translate ARFCN+BSIC keys provided by MS in the Um side into CGI + RAC keys used to identify target cells in RIM procedures against SGSNs on the Gb interface. This patch extends the already existing neighbor information storage in the VTY by allowing storage of CGI + RAC (RAC couldn't be stored beforehand). Related: SYS#4909 Depends: libosmocore.git Change-Id If48f412c32e8e5a3e604a78d12b74787a4786374 Change-Id: Ib07c9d23026332a207d4b7a0f7b4e76c0094e379 --- M doc/manuals/chapters/handover.adoc M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/neighbor_ident.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/osmo_bsc_main.c M tests/Makefile.am M tests/bsc/Makefile.am A tests/ctrl/osmo-bsc-neigh-test.cfg M tests/ctrl_test_runner.py M tests/gsm0408/Makefile.am M tests/neighbor_ident.vty 14 files changed, 471 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/handover.adoc b/doc/manuals/chapters/handover.adoc index 8601dce..4de744b 100644 --- a/doc/manuals/chapters/handover.adoc +++ b/doc/manuals/chapters/handover.adoc @@ -1,4 +1,5 @@ -== Handover +[[cs_handover]] +== CS Handover Handover is the process of moving a continuously used channel (lchan) from one cell to another. Usually, that is an ongoing call, so that phones are able to @@ -144,6 +145,7 @@ number of times across a network, and even between cells managed by one and the same BSC. +[[config_neigh]] === Configuring Neighbors The most important step to enable handover in OsmoBSC is to configure each cell @@ -692,3 +694,100 @@ 4G neighbor cells can be removed using the same command, just replacing `add` with `del`. + +[[ps_handover]] +== PS Handover + +Packet Switch Handover is mostly managed by the packet switching nodes such as +PCU, SGSN and GGSN. However, the PCU encounters a similar difficulty to that +explained in <>: that is, it must find a way to translate +ARFCN+BSIC identifiers provided by the MS into the sort of identifiers +understood by the Core Network (SGSN). These identifiers are in this case +composed of RAC+CI (instead LAC+CI), or more specifically, CGI+RAC (named as +"Packet Switched CGI" or "CGI-PS" from now on for convenience). + +Hence, it feels natural extending the <> storage in the BSC to +also provide Packet Switched related identifiers in order to provide the PCU the +required information to do the translations, instead of duplicating the whole +neighbor information in two different network nodes. + +This can be done, similarly to already presented CS related commands in +<>, by using the `neighbor cgi-ps` VTY command, which allows for +specifying the extra identifier (RAC) required by PS related translations: + +.Example: configuring PS neighbors within the local BSS in osmo-bsc.cfg, identified by CGI-PS (CGI+RAC) + +network + bts 0 +neighbor cgi-ps arfcn <0-1023> bsic (<0-63>|any) + + +This information should already be present by default if one uses the `local BTS +number` to identify the network, as long as that BTS is properly configured to +have GPRS enabled and the RAC code is set by `gprs routing area <0-255>` +command: + +.Example: configuring PS neighbors within the local BSS in osmo-bsc.cfg, identified by local BTS number + +network + bts 0 + gprs mode gprs + gprs routing area 45 + neighbor bts 1 + ... + bts 1 + gprs mode egprs + gprs routing area 48 + neighbor bts 0 + ... + + +This PS information is solely used by the Neighbor Resolution Service, aimed at +nodes other than BSC itself, and described below. + +=== Neighbor Resolution Service CTRL interface + +This service is provided in order to provide the PCU a way to translate +ARCFCN+BSIC into CGI-PS in order to use RIM services and accomplish PS +Handovers. + +This interface is Osmocom specific, since the standard doesn't provide any +specifications on how to provide this kind of information to the PCU. + +Since the PCU can be either BSC-colocated or BTS-colocated (hence on a different +host than BSC), this must be a network-based interface. Since the service is +Osmocom-specific, it was decided to re-use the CTRL interface available in most +Osmocom processes (see <>). + +Due to security concerns, the set of CTRL commands available in this +service is configured in a different IP address and port, since the service +needs to be reachable by all PCU under the BSC. This way the user can still +constrain the regular CTRL port (which may contains lots of co
Change in osmo-sgsn[master]: gbproxy: Increase TLLI cache timeout to 10s
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22161 ) Change subject: gbproxy: Increase TLLI cache timeout to 10s .. gbproxy: Increase TLLI cache timeout to 10s The range of SUSPEND/RESUME timers T3/T4 is up to 10s so we should keep the cache entries valid for this time. Fixes: OS#4895 Change-Id: I9e88e49981098831f3255938deb868f4503f650f Related: SYS#5235 --- M src/gbproxy/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index 91324dd..7f8260c 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -1413,7 +1413,7 @@ cfg->pool.bvc_fc_ratio = 100; cfg->pool.null_nri_ranges = osmo_nri_ranges_alloc(cfg); /* TODO: Make configurable */ - cfg->tlli_cache.timeout = 5; + cfg->tlli_cache.timeout = 10; hash_init(cfg->bss_nses); hash_init(cfg->sgsn_nses); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9e88e49981098831f3255938deb868f4503f650f Gerrit-Change-Number: 22161 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-sip-connector[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22137 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: Iae17e6d6f4242f98676dd3a1b01c419ac7288047 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c2ddf5a..90234e7 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -28,7 +28,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Iae17e6d6f4242f98676dd3a1b01c419ac7288047 Gerrit-Change-Number: 22137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged
Change in osmo-sip-connector[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22137 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Iae17e6d6f4242f98676dd3a1b01c419ac7288047 Gerrit-Change-Number: 22137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ggsn[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22138 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: Ie77a81d3bd7cdb739fa082d9e1b5ddeba433a9db --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c3a1570..17345a6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -38,7 +38,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie77a81d3bd7cdb739fa082d9e1b5ddeba433a9db Gerrit-Change-Number: 22138 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-ggsn[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22138 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie77a81d3bd7cdb739fa082d9e1b5ddeba433a9db Gerrit-Change-Number: 22138 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-e1-recorder[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/22153 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: I5349a67dcc6dd47e5a1cc9f8d30a2ca7aa1094f9 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b08865e..d9895ec 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/22153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I5349a67dcc6dd47e5a1cc9f8d30a2ca7aa1094f9 Gerrit-Change-Number: 22153 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-e1-recorder[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-recorder/+/22153 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-recorder/+/22153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-recorder Gerrit-Branch: master Gerrit-Change-Id: I5349a67dcc6dd47e5a1cc9f8d30a2ca7aa1094f9 Gerrit-Change-Number: 22153 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-cbc[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22154 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: Ide27f522e0979f9f7b41cd073d5451fa60ab125f --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e9b976b..104ba2a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ide27f522e0979f9f7b41cd073d5451fa60ab125f Gerrit-Change-Number: 22154 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-cbc[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22154 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ide27f522e0979f9f7b41cd073d5451fa60ab125f Gerrit-Change-Number: 22154 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmocom-bb[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/22143 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: If8f88bde0614547bb5c4f4f6e97fc20fcecd8a2c # --- --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 07a02c1..fafbdfb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -52,7 +52,6 @@ # Build and publish manuals if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals make -C "$base/doc/manuals" make -C "$base/doc/manuals" check -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/22143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8f88bde0614547bb5c4f4f6e97fc20fcecd8a2c Gerrit-Change-Number: 22143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmocom-bb[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/22143 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/22143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If8f88bde0614547bb5c4f4f6e97fc20fcecd8a2c Gerrit-Change-Number: 22143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22142 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: I511b2e1f4c3a9e0897cff4241ab5df12327de10d --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5d40573..78bd53a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I511b2e1f4c3a9e0897cff4241ab5df12327de10d Gerrit-Change-Number: 22142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in libosmo-sccp[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22142 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I511b2e1f4c3a9e0897cff4241ab5df12327de10d Gerrit-Change-Number: 22142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-remsim[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/22150 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: Ic4f26705854a0987aa72a9064a5278b01b4d078d # --- --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 30db3d7..37a779c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/22150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic4f26705854a0987aa72a9064a5278b01b4d078d Gerrit-Change-Number: 22150 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-remsim[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/22150 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/22150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ic4f26705854a0987aa72a9064a5278b01b4d078d Gerrit-Change-Number: 22150 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22147 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: I22246f3ff105183a7a7a0279fd6c5cde9cd19952 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b924075..c67a1c3 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -35,7 +35,6 @@ # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I22246f3ff105183a7a7a0279fd6c5cde9cd19952 Gerrit-Change-Number: 22147 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-hlr[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22147 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I22246f3ff105183a7a7a0279fd6c5cde9cd19952 Gerrit-Change-Number: 22147 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:31:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-iuh[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22144 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: I339cc37a259e30b131fadbdaebd413c54b04f0a0 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 46d38f7..a3a3d4a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -28,7 +28,6 @@ CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals CONFIG="--enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I339cc37a259e30b131fadbdaebd413c54b04f0a0 Gerrit-Change-Number: 22144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-iuh[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22144 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I339cc37a259e30b131fadbdaebd413c54b04f0a0 Gerrit-Change-Number: 22144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:30:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22148 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: If45bb7d4958b200ca6b5d1c5b8a52eba06944909 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e40e081..7c620b9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -81,7 +81,6 @@ export PATH="$inst/bin:$PATH" if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals PCU_CONFIG="$PCU_CONFIG --enable-manuals" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If45bb7d4958b200ca6b5d1c5b8a52eba06944909 Gerrit-Change-Number: 22148 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in openbsc[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22141 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Idb3b05412b99484f7f7de91ee96c69bfb4e3d511 Gerrit-Change-Number: 22141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:30:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22148 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If45bb7d4958b200ca6b5d1c5b8a52eba06944909 Gerrit-Change-Number: 22148 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:30:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in openbsc[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/22141 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: Idb3b05412b99484f7f7de91ee96c69bfb4e3d511 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index da8703a..4b9d532 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -54,7 +54,6 @@ # Build and publish manuals if [ "$WITH_MANUALS" = "1" ]; then # Build all manuals first - osmo-build-dep.sh osmo-gsm-manuals for dir in "$base"/manuals/*/; do make -C "$dir" done -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Idb3b05412b99484f7f7de91ee96c69bfb4e3d511 Gerrit-Change-Number: 22141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: Revert "contrib/jenkins.sh: ugly work-around for PATH problems"
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22159 ) Change subject: Revert "contrib/jenkins.sh: ugly work-around for PATH problems" .. Revert "contrib/jenkins.sh: ugly work-around for PATH problems" Revert, because we don't overwrite PATH anymore. This reverts commit 5ab3bfdba4de2af32aeffdc92de963cb34c9715a. Related: OS#4911 Change-Id: I981511f406b80b80e2a863c94b6a60755d824fec --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved; Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d69fcbb..171d368 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -5,15 +5,6 @@ # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") -# ugly, ugly hack to work around the fact that we cannot _extend_ the path when executing -# a docker container. We can either override it (and loose our /opt/... toolchain paths) -# or we can not specify the /build_bin whcih means the osmo-build-dep.sh is not found -# See https://osmocom.org/issues/4911 -if [ -d /build_bin ]; then - PATH=$PATH:/build_bin - export PATH -fi - if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" exit 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I981511f406b80b80e2a863c94b6a60755d824fec Gerrit-Change-Number: 22159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: Revert "contrib/jenkins.sh: ugly work-around for PATH problems"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22159 ) Change subject: Revert "contrib/jenkins.sh: ugly work-around for PATH problems" .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I981511f406b80b80e2a863c94b6a60755d824fec Gerrit-Change-Number: 22159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:30:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22156 ) Change subject: ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH .. ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH Hence 4248 becomes the well-known port for osmo-bsc's Neighbor Resolution Service. Related: SYS#4909 Change-Id: Ic77a8cff022c2f939a684ebd1f9f62a82e0de510 --- M include/osmocom/ctrl/ports.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index 9759dc1..91206dc 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -12,6 +12,7 @@ #define OSMO_CTRL_PORT_TRX 4236 /* 4237 used by VTY interface */ #define OSMO_CTRL_PORT_BTS 4238 +#define OSMO_CTRL_PORT_BSC_NEIGH 4248 /* osmo-bsc Neighbor Resloution Service */ #define OSMO_CTRL_PORT_NITB_BSC4249 #define OSMO_CTRL_PORT_BSC_NAT 4250 #define OSMO_CTRL_PORT_SGSN4251 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic77a8cff022c2f939a684ebd1f9f62a82e0de510 Gerrit-Change-Number: 22156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in libosmocore[master]: ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22156 ) Change subject: ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic77a8cff022c2f939a684ebd1f9f62a82e0de510 Gerrit-Change-Number: 22156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:30:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22156 ) Change subject: ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic77a8cff022c2f939a684ebd1f9f62a82e0de510 Gerrit-Change-Number: 22156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:30:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: Introduce Neighbor Resolution Service
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21848 ) Change subject: Introduce Neighbor Resolution Service .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib07c9d23026332a207d4b7a0f7b4e76c0094e379 Gerrit-Change-Number: 21848 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:29:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Increase TLLI cache timeout to 10s
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22161 ) Change subject: gbproxy: Increase TLLI cache timeout to 10s .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9e88e49981098831f3255938deb868f4503f650f Gerrit-Change-Number: 22161 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 13 Jan 2021 17:27:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: doc: handover: Fix malformed table
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22160 ) Change subject: doc: handover: Fix malformed table .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I197598e8dba719ef7e0f5a1727aa3cc82b5b5c9a Gerrit-Change-Number: 22160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 17:27:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: doc: handover: Fix malformed table
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22160 ) Change subject: doc: handover: Fix malformed table .. doc: handover: Fix malformed table Change-Id: I197598e8dba719ef7e0f5a1727aa3cc82b5b5c9a --- M doc/manuals/chapters/handover.adoc 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/handover.adoc b/doc/manuals/chapters/handover.adoc index d9805f7..8601dce 100644 --- a/doc/manuals/chapters/handover.adoc +++ b/doc/manuals/chapters/handover.adoc @@ -634,6 +634,7 @@ * EARFCN (EUTRAN Absolute Radio Channel Number) on which the cell broadcasts * Reselection thresholds towards E-UTRAN cells: + [width="30%"] | | 0 | 0 dB @@ -642,10 +643,12 @@ | 3 | 6 dB | ... | ... | 31 | 62 dB -|= +| + * Priority of E-UTRAN frequency: 0 = lowest priority, ..., 7 = highest priority * QRXLEVMIN parameter: Minimum required RX level in the UTRAN FDD cell (dBm), see 3GPP TS 25.304. + [width="30%"] | | 0 | -140 dBm @@ -654,6 +657,7 @@ | ... | ... | 31 | -78 dBm | + * Measurement bandwidth in MHz, see 3GPP TS 44.018 and 3GPP TS 44.060. This field specifies the minimum value of the channel bandwidth of all valid E-UTRAN cells on the specified EARFCN. It is defined by the @@ -664,6 +668,7 @@ station supporting wideband RSRQ measurements shall measure over the indicated number of resource blocks. The field is coded according to the following table: + [width="30%"] | | 0 | N_RB = 6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I197598e8dba719ef7e0f5a1727aa3cc82b5b5c9a Gerrit-Change-Number: 22160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gbproxy: Increase TLLI cache timeout to 10s
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22161 ) Change subject: gbproxy: Increase TLLI cache timeout to 10s .. gbproxy: Increase TLLI cache timeout to 10s The range of SUSPEND/RESUME timers T3/T4 is up to 10s so we should keep the cache entries valid for this time. Fixes: OS#4895 Change-Id: I9e88e49981098831f3255938deb868f4503f650f Related: SYS#5235 --- M src/gbproxy/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/22161/1 diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index 91324dd..7f8260c 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -1413,7 +1413,7 @@ cfg->pool.bvc_fc_ratio = 100; cfg->pool.null_nri_ranges = osmo_nri_ranges_alloc(cfg); /* TODO: Make configurable */ - cfg->tlli_cache.timeout = 5; + cfg->tlli_cache.timeout = 10; hash_init(cfg->bss_nses); hash_init(cfg->sgsn_nses); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9e88e49981098831f3255938deb868f4503f650f Gerrit-Change-Number: 22161 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in osmo-bsc[master]: doc: handover: Fix malformed table
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22160 ) Change subject: doc: handover: Fix malformed table .. doc: handover: Fix malformed table Change-Id: I197598e8dba719ef7e0f5a1727aa3cc82b5b5c9a --- M doc/manuals/chapters/handover.adoc 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/22160/1 diff --git a/doc/manuals/chapters/handover.adoc b/doc/manuals/chapters/handover.adoc index d9805f7..8601dce 100644 --- a/doc/manuals/chapters/handover.adoc +++ b/doc/manuals/chapters/handover.adoc @@ -634,6 +634,7 @@ * EARFCN (EUTRAN Absolute Radio Channel Number) on which the cell broadcasts * Reselection thresholds towards E-UTRAN cells: + [width="30%"] | | 0 | 0 dB @@ -642,10 +643,12 @@ | 3 | 6 dB | ... | ... | 31 | 62 dB -|= +| + * Priority of E-UTRAN frequency: 0 = lowest priority, ..., 7 = highest priority * QRXLEVMIN parameter: Minimum required RX level in the UTRAN FDD cell (dBm), see 3GPP TS 25.304. + [width="30%"] | | 0 | -140 dBm @@ -654,6 +657,7 @@ | ... | ... | 31 | -78 dBm | + * Measurement bandwidth in MHz, see 3GPP TS 44.018 and 3GPP TS 44.060. This field specifies the minimum value of the channel bandwidth of all valid E-UTRAN cells on the specified EARFCN. It is defined by the @@ -664,6 +668,7 @@ station supporting wideband RSRQ measurements shall measure over the indicated number of resource blocks. The field is coded according to the following table: + [width="30%"] | | 0 | N_RB = 6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I197598e8dba719ef7e0f5a1727aa3cc82b5b5c9a Gerrit-Change-Number: 22160 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bsc[master]: Introduce Neighbor Resolution Service
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/21848 to look at the new patch set (#9). Change subject: Introduce Neighbor Resolution Service .. Introduce Neighbor Resolution Service This new CTRL interface allows users of this BSC (such as attached PCU) to gather neighbor information. This interface is needed for PCU to translate ARFCN+BSIC keys provided by MS in the Um side into CGI + RAC keys used to identify target cells in RIM procedures against SGSNs on the Gb interface. This patch extends the already existing neighbor information storage in the VTY by allowing storage of CGI + RAC (RAC couldn't be stored beforehand). Related: SYS#4909 Depends: libosmocore.git Change-Id If48f412c32e8e5a3e604a78d12b74787a4786374 Change-Id: Ib07c9d23026332a207d4b7a0f7b4e76c0094e379 --- M doc/manuals/chapters/handover.adoc M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/neighbor_ident.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/osmo_bsc_main.c M tests/Makefile.am M tests/bsc/Makefile.am A tests/ctrl/osmo-bsc-neigh-test.cfg M tests/ctrl_test_runner.py M tests/gsm0408/Makefile.am M tests/neighbor_ident.vty 14 files changed, 471 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/48/21848/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib07c9d23026332a207d4b7a0f7b4e76c0094e379 Gerrit-Change-Number: 21848 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-e1-hardware[master]: Revert "contrib/jenkins.sh: ugly work-around for PATH problems"
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22159 ) Change subject: Revert "contrib/jenkins.sh: ugly work-around for PATH problems" .. Revert "contrib/jenkins.sh: ugly work-around for PATH problems" Revert, because we don't overwrite PATH anymore. This reverts commit 5ab3bfdba4de2af32aeffdc92de963cb34c9715a. Related: OS#4911 Change-Id: I981511f406b80b80e2a863c94b6a60755d824fec --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/59/22159/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index d69fcbb..171d368 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -5,15 +5,6 @@ # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") -# ugly, ugly hack to work around the fact that we cannot _extend_ the path when executing -# a docker container. We can either override it (and loose our /opt/... toolchain paths) -# or we can not specify the /build_bin whcih means the osmo-build-dep.sh is not found -# See https://osmocom.org/issues/4911 -if [ -d /build_bin ]; then - PATH=$PATH:/build_bin - export PATH -fi - if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" exit 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I981511f406b80b80e2a863c94b6a60755d824fec Gerrit-Change-Number: 22159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-ci[master]: Revert "osmo-build-dep.sh: don't build osmo-gsm-manuals"
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22158 ) Change subject: Revert "osmo-build-dep.sh: don't build osmo-gsm-manuals" .. Patch Set 1: Marking as WIP until the depending patches are merged (the ones that remove 'osmo-build-dep.sh osmo-gsm-manuals' calls). -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I88d57ee04775dc75e6ca3152d7edfa7f47608c8a Gerrit-Change-Number: 22158 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Comment-Date: Wed, 13 Jan 2021 16:00:41 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: Revert "osmo-build-dep.sh: don't build osmo-gsm-manuals"
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22158 ) Change subject: Revert "osmo-build-dep.sh: don't build osmo-gsm-manuals" .. Revert "osmo-build-dep.sh: don't build osmo-gsm-manuals" Now that we have the proper fix of making a clone of osmo-gsm-manuals.git available before builds start, and not using 'osmo-build-dep.sh osmo-gsm-manuals' in the contrib/jenkins.sh files anymore, we can remove the temporary solution. This reverts commit 4cbc445616fc9e0e4ded5eba56b2e741d0f332a3. Depends: https://gerrit.osmocom.org/q/topic:jenkins-no-manuals-dep Change-Id: I88d57ee04775dc75e6ca3152d7edfa7f47608c8a --- M scripts/osmo-build-dep.sh 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/22158/1 diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 45916f6..7013414 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -54,14 +54,6 @@ cd "$subdir" fi -# osmo-gsm-manuals: save time by only cloning the repository (OS#4912). -# Projects depending on osmo-gsm-manuals can still build the manuals, because -# we set OSMO_GSM_MANUALS_DIR to the clone destination. -if [ "$project" = "osmo-gsm-manuals" ]; then - echo "WARNING: osmo-gsm-manuals cloned, but skipping build (OS#4912)" - exit 0 -fi - autoreconf --install --force ./configure --prefix="$inst/stow/$project" --with-systemdsystemunitdir="$inst/stow/$project/lib/systemd/system" $cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I88d57ee04775dc75e6ca3152d7edfa7f47608c8a Gerrit-Change-Number: 22158 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-sip-connector[master]: contrib/jenkins: don't build osmo-gsm-manuals
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22137 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Iae17e6d6f4242f98676dd3a1b01c419ac7288047 Gerrit-Change-Number: 22137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 15:44:20 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: remove duplicate docker_run
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22132 )
Change subject: jobs: remove duplicate docker_run
..
jobs: remove duplicate docker_run
docker_run was duplicated for osmo-e1-hardware and no2bootloader, so the
'-e PATH' line could be removed from the global docker_run. It was
overriding the PATH, which then did not contain the path to the compiler
toolchain anymore.
This workaround is not needed anymore since de5aa17d6 ('jobs: don't
overwrite PATH in "docker run"').
Related: OS#4911
Change-Id: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 0 insertions(+), 55 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 99bfcce..5447495 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -122,23 +122,6 @@
cmd: '{docker_run} {docker_img_erlang} {timeout_cmd}
/build/contrib/jenkins.sh'
- osmo-e1-hardware:
- docker_run: |
-ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-mkdir -p "$ARTIFACT_STORE"
-docker run --rm=true \
- --cap-add SYS_PTRACE \
- -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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
- -e WITH_MANUALS="1" \
- -w /build -i -u build \
- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
- -v "$ARTIFACT_STORE:/artifact_store" \
docker_img: 'registry.osmocom.org/$USER/fpga-build'
cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
{timeout_cmd} /build/contrib/jenkins.sh'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 4b0f621..cab841d 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -202,48 +202,10 @@
./contrib/jenkins_bts_model.sh "$BTS_MODEL"
- osmo-e1-hardware:
- docker_run: |
-ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-mkdir -p "$ARTIFACT_STORE"
-docker run --rm=true \
- --cap-add SYS_PTRACE \
- -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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
- -e PUBLISH="1" \
- -e WITH_MANUALS="1" \
- -w /build -i -u build \
- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
- -v "$ARTIFACT_STORE:/artifact_store" \
- -v "$HOME/.ssh:/home/build/.ssh:ro" \
docker_img: 'registry.osmocom.org/$USER/fpga-build'
cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
/build/contrib/jenkins.sh --publish'
- no2bootloader:
git_base_url: github.com/no2fpga
- docker_run: |
-ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
-mkdir -p "$ARTIFACT_STORE"
-docker run --rm=true \
- --cap-add SYS_PTRACE \
- -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 OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
- -e PARALLEL_MAKE="$PARALLEL_MAKE" \
- -e PUBLISH="1" \
- -e WITH_MANUALS="1" \
- -w /build -i -u build \
- -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
- -v "$ARTIFACT_STORE:/artifact_store" \
- -v "$HOME/.ssh:/home/build/.ssh:ro" \
docker_img: 'registry.osmocom.org/$USER/fpga-build'
cmd: 'docker pull {docker_img} && {docker_run} {docker_img}
/build/contrib/jenkins.sh --publish'
email: gerrit-log@lists.osmocom.org lafo...@gnumonks.org
kre...@sysmocom.de 246...@gmail.com
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22132
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86
Gerrit-Change-Number: 22132
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewe
Change in osmo-ci[master]: contrib/jenkins: add missing cd ~/osmo-ci
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22157 )
Change subject: contrib/jenkins: add missing cd ~/osmo-ci
..
contrib/jenkins: add missing cd ~/osmo-ci
Fixes: 829f8b94 ("ansible: tasks/osmo-ci: clone osmo-gsm-manuals")
Change-Id: I3ca101f73cecfc5cda447ffce53a104ecc39e1fd
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index e93e802..e1564a7 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -18,5 +18,6 @@
clone_repo osmo-gsm-manuals
if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then
+ cd ~/osmo-ci
scripts/osmo-ci-docker-rebuild.sh
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22157
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I3ca101f73cecfc5cda447ffce53a104ecc39e1fd
Gerrit-Change-Number: 22157
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in osmo-ci[master]: jobs: update OSMO_GSM_MANUALS_DIR
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22131 )
Change subject: jobs: update OSMO_GSM_MANUALS_DIR
..
jobs: update OSMO_GSM_MANUALS_DIR
Use new location inside / outside docker, where the repository was
cloned already. So it does not need to be cloned during the job.
Roll out: make sure that the docker images are already built! (or let me
merge it)
Related: OS#4912
Depends: docker-playground Id402e0ea372b5ca8a6c8f6f5beb190544c888207
Change-Id: Ibe91a613162687589e006cba99193606fb8a3eb9
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index fbefbdb..99bfcce 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -34,7 +34,7 @@
-e JOB_NAME="$JOB_NAME" \
-e MAKE=make \
-e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
+ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-e WITH_MANUALS="1" \
-w /build -i -u build \
@@ -113,7 +113,7 @@
concurrent: false
cmd: |
export ASCIIDOC_WARNINGS_CHECK="1"
-export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"
+export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"
{timeout_cmd} ./contrib/jenkins_bts_model.sh "$BTS_MODEL"
- osmo_dia2gsup:
@@ -133,7 +133,7 @@
-e JOB_NAME="$JOB_NAME" \
-e MAKE=make \
-e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
+ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-e WITH_MANUALS="1" \
-w /build -i -u build \
@@ -247,7 +247,7 @@
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"rpi4-deb9build-ansible")
cmd: |
export ASCIIDOC_WARNINGS_CHECK=1
-export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"
+export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"
{timeout_cmd} ./contrib/jenkins.sh
- osmocom-bb
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index c648a7b..4b0f621 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -33,7 +33,7 @@
-e JOB_NAME="$JOB_NAME" \
-e MAKE=make \
-e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
+ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-e PUBLISH="1" \
-e WITH_MANUALS="1" \
@@ -197,7 +197,7 @@
concurrent: false
cmd: |
export ASCIIDOC_WARNINGS_CHECK=1
-export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"
+export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"
export PUBLISH=1
./contrib/jenkins_bts_model.sh "$BTS_MODEL"
@@ -213,7 +213,7 @@
-e JOB_NAME="$JOB_NAME" \
-e MAKE=make \
-e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
+ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-e PUBLISH="1" \
-e WITH_MANUALS="1" \
@@ -236,7 +236,7 @@
-e JOB_NAME="$JOB_NAME" \
-e MAKE=make \
-e OSMOPY_DEBUG_TCP_SOCKETS="1" \
- -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
+ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-e PUBLISH="1" \
-e WITH_MANUALS="1" \
@@ -361,7 +361,7 @@
(INSTR == "--with-neon-vfpv4" && WITH_MANUALS == "0" && label ==
"rpi4-deb9build-ansible")
cmd: |
export ASCIIDOC_WARNINGS_CHECK=1
-export OSMO_GSM_MANUALS_DIR="$PWD/deps/osmo-gsm-manuals"
+export OSMO_GSM_MANUALS_DIR="$HOME/osmo-gsm-manuals"
export PUBLISH=1
./contrib/jenkins.sh
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22131
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ibe91a613162687589e006cba99193606fb8a3eb9
Gerrit-Change-Number: 22131
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmi
Change in osmo-ci[master]: contrib/jenkins: add missing cd ~/osmo-ci
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22157 ) Change subject: contrib/jenkins: add missing cd ~/osmo-ci .. Patch Set 1: Verified+1 Code-Review+2 Trivial fixup commit, merging directly to unbreak the update-osmo-ci-on-slaves job. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ca101f73cecfc5cda447ffce53a104ecc39e1fd Gerrit-Change-Number: 22157 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 13 Jan 2021 15:28:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins: add missing cd ~/osmo-ci
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/22157 )
Change subject: contrib/jenkins: add missing cd ~/osmo-ci
..
contrib/jenkins: add missing cd ~/osmo-ci
Fixes: 829f8b94 ("ansible: tasks/osmo-ci: clone osmo-gsm-manuals")
Change-Id: I3ca101f73cecfc5cda447ffce53a104ecc39e1fd
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/22157/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index e93e802..e1564a7 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -18,5 +18,6 @@
clone_repo osmo-gsm-manuals
if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then
+ cd ~/osmo-ci
scripts/osmo-ci-docker-rebuild.sh
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22157
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I3ca101f73cecfc5cda447ffce53a104ecc39e1fd
Gerrit-Change-Number: 22157
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs/osmo-gsm-manuals-trigger: new job
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22130 ) Change subject: jobs/osmo-gsm-manuals-trigger: new job .. jobs/osmo-gsm-manuals-trigger: new job On change, roll out osmo-gsm-manuals to relevant build environments. Related: OS#4912 Change-Id: I104525826068b016b5e06ea52567da4d7beaf7a4 --- A jobs/osmo-gsm-manuals-trigger.yml 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/osmo-gsm-manuals-trigger.yml b/jobs/osmo-gsm-manuals-trigger.yml new file mode 100644 index 000..d83b9fa --- /dev/null +++ b/jobs/osmo-gsm-manuals-trigger.yml @@ -0,0 +1,37 @@ +# Roll out osmo-gsm-manuals to relevant build environments: +# * jenkins build slaves (update-osmo-ci-on-slaves) +# * docker images built on build slaves (update-osmo-ci-on-slaves) +# * docker image built in registry: fpga-build (registry-rebuild-upload-fpga-build) + +- project: +name: osmo-gsm-manuals-trigger +jobs: + - 'osmo-gsm-manuals-trigger' + +# Trigger from osmo-gsm-manuals.git too +- job: +name: osmo-gsm-manuals-trigger +description: | + Roll out osmo-gsm-manuals to relevant build environments. + + Related: https://osmocom.org/issues/4912";>OS#4912 +node: osmocom-master-debian9 +scm: + - git: + url: git://git.osmocom.org/osmo-gsm-manuals + git-config-name: 'Jenkins Builder' + git-config-email: 'jenk...@osmocom.org' + skip-tag: true + branches: +- 'origin/master' +triggers: + - pollscm: + cron: "H/5 * * * *" + ignore-post-commit-hooks: false +publishers: + - trigger: + project: > +update-osmo-ci-on-slaves, +registry-rebuild-upload-fpga-build + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I104525826068b016b5e06ea52567da4d7beaf7a4 Gerrit-Change-Number: 22130 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
Change in osmo-ci[master]: ansible: tasks/osmo-ci: clone osmo-gsm-manuals
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22129 )
Change subject: ansible: tasks/osmo-ci: clone osmo-gsm-manuals
..
ansible: tasks/osmo-ci: clone osmo-gsm-manuals
Perform the initial clone of osmo-gsm-manuals.git, just like osmo-ci.git.
Related: OS#4912
Change-Id: I39a09a4297c7c78357b3d4db4ab89547fa08db59
---
M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
index d70d8b6..b26d6ab 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
@@ -11,6 +11,13 @@
repo: "https://git.osmocom.org/osmo-ci";
dest: "/home/{{ jenkins_user }}/osmo-ci"
+- name: deploy osmo-gsm-manuals to home directory
+ become: yes
+ become_user: "{{ jenkins_user }}"
+ git:
+repo: "https://git.osmocom.org/osmo-gsm-manuals";
+dest: "/home/{{ jenkins_user }}/osmo-gsm-manuals"
+
- name: rebuild osmocom docker images for jenkins build tests
become: yes
become_user: "{{ jenkins_user }}"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22129
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I39a09a4297c7c78357b3d4db4ab89547fa08db59
Gerrit-Change-Number: 22129
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: contrib/jenkins.sh: clone osmo-gsm-manuals too
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22128 )
Change subject: contrib/jenkins.sh: clone osmo-gsm-manuals too
..
contrib/jenkins.sh: clone osmo-gsm-manuals too
Make osmo-gsm-manuals.git available as ~/osmo-gsm-manuals, so it can be
used by osmo-trx and osmo-bts (the only two projects building manuals,
which are not running in docker as of writing) instead of cloning the
repository in their contrib/jenkins.sh.
A similar change to clone osmo-gsm-manuals in the debian-stretch-jenkins
image used by all other jobs that build manuals, is done in
docker-playground 7e4c8c6f1f798b9b8e57af97131ce3759528e0de.
osmo-ci's contrib/jenkins.sh is called by the update-osmo-ci-on-slaves
job.
Related: OS#4912
Change-Id: I742fd929e39ca32d6034a30af75b6c8e5b47b233
---
M contrib/jenkins.sh
1 file changed, 13 insertions(+), 6 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 3ab942a..e93e802 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,14 +1,21 @@
#!/bin/sh
set -e -x
-cd ~/osmo-ci || (cd ~/ && git clone git://git.osmocom.org/osmo-ci && cd
~/osmo-ci)
-git rev-parse HEAD
-git status
+# Clone repository to ~/, or update existing
+# $1: name of osmocom project
+clone_repo() {
+ cd ~/"$1" || (cd ~/ && git clone git://git.osmocom.org/"$1" && cd
~/"$1")
+ git rev-parse HEAD
+ git status
-git fetch && git checkout -f -B master origin/master
+ git fetch && git checkout -f -B master origin/master
-git rev-parse HEAD
-git status
+ git rev-parse HEAD
+ git status
+}
+
+clone_repo osmo-ci
+clone_repo osmo-gsm-manuals
if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then
scripts/osmo-ci-docker-rebuild.sh
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22128
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I742fd929e39ca32d6034a30af75b6c8e5b47b233
Gerrit-Change-Number: 22128
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: fpga-build: don't write path to /etc/environment
osmith has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/22136 )
Change subject: fpga-build: don't write path to /etc/environment
..
fpga-build: don't write path to /etc/environment
PATH isn't overwritten anymore when jenkins runs docker in osmo-ci.git's
master-builds.yml / gerrit-verifications.yml, therefore we can remove
this hack.
Change-Id: I5bff98f7af1a2f2de88c8d96d1e30de960057d01
---
M fpga-build/Dockerfile
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
osmith: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile
index a46641c..135af71 100644
--- a/fpga-build/Dockerfile
+++ b/fpga-build/Dockerfile
@@ -37,9 +37,6 @@
RUNmkdir /build
RUNchown build:build /build
-# ENV doesn't worrk for other users
-RUNecho
"PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:\$PATH"
>> /etc/environment
-
ENV
PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH}
# Install osmo-ci.git/scripts to /usr/local/bin
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22136
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I5bff98f7af1a2f2de88c8d96d1e30de960057d01
Gerrit-Change-Number: 22136
Gerrit-PatchSet: 3
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: debian-stretch-jenkins, fpga-build: add gsm-manuals
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22134 ) Change subject: debian-stretch-jenkins,fpga-build: add gsm-manuals .. debian-stretch-jenkins,fpga-build: add gsm-manuals Prepare to remove 'build-deps.sh osmo-gsm-manuals' calls from all projects. Related: OS#4912 Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 --- M debian-stretch-jenkins/Dockerfile M fpga-build/Dockerfile 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index 1f87445..54c72ed 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -156,6 +156,10 @@ -type f ) \ /usr/local/bin +# Install osmo-gsm-manuals to /opt/osmo-gsm-manuals +ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit +RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals + # Set a UTF-8 locale RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ dpkg-reconfigure --frontend=noninteractive locales && \ diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index 9a81c96..a46641c 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -49,3 +49,7 @@ -maxdepth 1 \ -type f ) \ /usr/local/bin + +# Install osmo-gsm-manuals to /opt/osmo-gsm-manuals +ADDhttp://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit +RUNgit -C /opt clone https://git.osmocom.org/osmo-gsm-manuals -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 Gerrit-Change-Number: 22134 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22135 ) Change subject: Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent .. Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent Change-Id: Ia6b12b2c35f69eb0434797b29ee0ef676b032250 --- M debian-stretch-jenkins/Dockerfile M osmo-gsm-tester/Dockerfile 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index 54c72ed..fcd093b 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -154,7 +154,7 @@ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ -type f ) \ - /usr/local/bin + /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 0503fc6..52dc999 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -141,7 +141,7 @@ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ -type f ) \ - /usr/local/bin + /usr/local/bin # Copy several scripts and permission for osmo-gsm-tester: RUN mkdir -p /usr/local/bin/ && cp osmo-gsm-tester/utils/bin/* /usr/local/bin/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6b12b2c35f69eb0434797b29ee0ef676b032250 Gerrit-Change-Number: 22135 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: fpga-build: add osmo-ci
osmith has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/22133 )
Change subject: fpga-build: add osmo-ci
..
fpga-build: add osmo-ci
Clone osmo-ci.git, and install all files from scripts/* to
/usr/local/bin.
Related: OS#4911
Change-Id: I3625d6f10e566101fb25963757da6827670ca41b
---
M fpga-build/Dockerfile
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile
index a9c3ceb..9a81c96 100644
--- a/fpga-build/Dockerfile
+++ b/fpga-build/Dockerfile
@@ -41,3 +41,11 @@
RUNecho
"PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:\$PATH"
>> /etc/environment
ENV
PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH}
+
+# Install osmo-ci.git/scripts to /usr/local/bin
+ADDhttp://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit
+RUNgit clone https://git.osmocom.org/osmo-ci osmo-ci && \
+ cp -v $(find osmo-ci/scripts \
+ -maxdepth 1 \
+ -type f ) \
+ /usr/local/bin
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22133
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I3625d6f10e566101fb25963757da6827670ca41b
Gerrit-Change-Number: 22133
Gerrit-PatchSet: 3
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: fpga-build: don't write path to /etc/environment
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22136 ) Change subject: fpga-build: don't write path to /etc/environment .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5bff98f7af1a2f2de88c8d96d1e30de960057d01 Gerrit-Change-Number: 22136 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:58:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22135 ) Change subject: Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6b12b2c35f69eb0434797b29ee0ef676b032250 Gerrit-Change-Number: 22135 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:58:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-jenkins, fpga-build: add gsm-manuals
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22134 ) Change subject: debian-stretch-jenkins,fpga-build: add gsm-manuals .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 Gerrit-Change-Number: 22134 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:58:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: fpga-build: add osmo-ci
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22133 ) Change subject: fpga-build: add osmo-ci .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3625d6f10e566101fb25963757da6827670ca41b Gerrit-Change-Number: 22133 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:58:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-jenkins, fpga-build: add gsm-manuals
Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22134 to look at the new patch set (#3). Change subject: debian-stretch-jenkins,fpga-build: add gsm-manuals .. debian-stretch-jenkins,fpga-build: add gsm-manuals Prepare to remove 'build-deps.sh osmo-gsm-manuals' calls from all projects. Related: OS#4912 Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 --- M debian-stretch-jenkins/Dockerfile M fpga-build/Dockerfile 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/22134/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 Gerrit-Change-Number: 22134 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in docker-playground[master]: fpga-build: add osmo-ci
Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22133 to look at the new patch set (#3). Change subject: fpga-build: add osmo-ci .. fpga-build: add osmo-ci Clone osmo-ci.git, and install all files from scripts/* to /usr/local/bin. Related: OS#4911 Change-Id: I3625d6f10e566101fb25963757da6827670ca41b --- M fpga-build/Dockerfile 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/22133/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3625d6f10e566101fb25963757da6827670ca41b Gerrit-Change-Number: 22133 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in docker-playground[master]: fpga-build: add osmo-ci
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22133 ) Change subject: fpga-build: add osmo-ci .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3625d6f10e566101fb25963757da6827670ca41b Gerrit-Change-Number: 22133 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:47:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: debian-stretch-jenkins, fpga-build: add gsm-manuals
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22134 ) Change subject: debian-stretch-jenkins,fpga-build: add gsm-manuals .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 Gerrit-Change-Number: 22134 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:47:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent
Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22135 to look at the new patch set (#2). Change subject: Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent .. Cosmetic: debian-stretch-jenkins, osmo-gsm-tester: fix indent Change-Id: Ia6b12b2c35f69eb0434797b29ee0ef676b032250 --- M debian-stretch-jenkins/Dockerfile M osmo-gsm-tester/Dockerfile 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/35/22135/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6b12b2c35f69eb0434797b29ee0ef676b032250 Gerrit-Change-Number: 22135 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in docker-playground[master]: debian-stretch-jenkins, fpga-build: add gsm-manuals
Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22134 to look at the new patch set (#2). Change subject: debian-stretch-jenkins,fpga-build: add gsm-manuals .. debian-stretch-jenkins,fpga-build: add gsm-manuals Prepare to remove 'build-deps.sh osmo-gsm-manuals' calls from all projects. Related: OS#4912 Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 --- M debian-stretch-jenkins/Dockerfile M fpga-build/Dockerfile 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/22134/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id402e0ea372b5ca8a6c8f6f5beb190544c888207 Gerrit-Change-Number: 22134 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in docker-playground[master]: fpga-build: add osmo-ci
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/22133 ) Change subject: fpga-build: add osmo-ci .. fpga-build: add osmo-ci Clone osmo-ci.git, and install all files from scripts/* to /usr/local/bin. Related: OS#4911 Change-Id: I3625d6f10e566101fb25963757da6827670ca41b --- M fpga-build/Dockerfile 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/22133/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3625d6f10e566101fb25963757da6827670ca41b Gerrit-Change-Number: 22133 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: power_control: print current RxLev and lower/upper thresholds
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22117 ) Change subject: power_control: print current RxLev and lower/upper thresholds .. Patch Set 1: Code-Review+1 OK and I see the CALC_TARGET part is still conserved because we still use that as a target for MS power, but not for BS power. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5f8c987054b2b01acdb9f525d06ca15bbc577070 Gerrit-Change-Number: 22117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 14:40:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: print current RxLev and lower/upper thresholds
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22117 ) Change subject: power_control: print current RxLev and lower/upper thresholds .. Patch Set 1: > Patch Set 1: > > So IIUC we don't print the desired target level anymore because that's no > longer the aim of the algo? because we now target a given RxLev instead of a > given received dBm? If that's not the case, then I think it still makes sense > to print that value, which you are removing in this patch (and you are not > saying in the commit message). Well, since we introduced the hysteresis there is no "desired target level" anymore; we have lower and upper thresholds instead. Once the averaged RxLev enters the threshold window, the loop would not try to increase/decrease it (by decreasing/increasing attenuation) further towards the target, unless it leaves that window. So yes, I think it does not make sense to print the "target" anymore. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5f8c987054b2b01acdb9f525d06ca15bbc577070 Gerrit-Change-Number: 22117 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 14:22:33 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: bts: fix uninitialized memaccess in BTS::send_gsmtap()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/22155 )
Change subject: bts: fix uninitialized memaccess in BTS::send_gsmtap()
..
bts: fix uninitialized memaccess in BTS::send_gsmtap()
Change-Id: I7c5105c9e8a2c680dc8b24cc5e3bda6f7405a3ee
Fixes: CID#216511
---
M src/bts.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/bts.cpp b/src/bts.cpp
index 87afc9f..307df94 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -529,7 +529,7 @@
uint8_t ts_no, uint8_t channel, uint32_t fn,
const uint8_t *data, unsigned int len)
{
- struct pcu_l1_meas meas;
+ struct pcu_l1_meas meas = { 0 };
send_gsmtap_meas(categ, uplink, trx_no, ts_no, channel, fn, data, len,
&meas);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22155
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7c5105c9e8a2c680dc8b24cc5e3bda6f7405a3ee
Gerrit-Change-Number: 22155
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-pcu[master]: bts: fix uninitialized memaccess in BTS::send_gsmtap_rach()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/22008 )
Change subject: bts: fix uninitialized memaccess in BTS::send_gsmtap_rach()
..
bts: fix uninitialized memaccess in BTS::send_gsmtap_rach()
Unfortunately, RACH.ind on the PCU interface contains no Uplink
measurements: neiter RSSI nor C/I. In order to avoid sending
garbage, let's zero-initialize 'struct pcu_l1_meas'.
Change-Id: I8c3210c428da17d23d798f3ef9df941ded6e162a
Fixes: CID#216512
---
M src/bts.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/bts.cpp b/src/bts.cpp
index bd0a1d2..87afc9f 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -506,7 +506,7 @@
void BTS::send_gsmtap_rach(enum pcu_gsmtap_category categ, uint8_t channel,
const struct rach_ind_params *rip)
{
- struct pcu_l1_meas meas;
+ struct pcu_l1_meas meas = { 0 };
uint8_t ra_buf[2];
/* 3GPP TS 44.004 defines 11 bit RA as follows: .yyy
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22008
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I8c3210c428da17d23d798f3ef9df941ded6e162a
Gerrit-Change-Number: 22008
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22152 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. contrib/jenkins: don't build osmo-gsm-manuals Related: OS#4912 Change-Id: Ie2f193656386038872adddfbd770ea193ace92e5 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved; Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 39d7f4c..d69fcbb 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -67,7 +67,6 @@ # manuals build + optional publication if [ "$WITH_MANUALS" = "1" ]; then - osmo-build-dep.sh osmo-gsm-manuals make -C doc/manuals clean all if [ "$PUBLISH" = "1" ]; then make -C doc/manuals publish -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ie2f193656386038872adddfbd770ea193ace92e5 Gerrit-Change-Number: 22152 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: doc/manuals/Makefile: fix typo in 'srcdir'
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22127 ) Change subject: doc/manuals/Makefile: fix typo in 'srcdir' .. doc/manuals/Makefile: fix typo in 'srcdir' Prevent the following error (generating manuals seemed to work fine regardless): realpath: missing operand Try 'realpath --help' for more information. make: Nothing to be done for 'all'. Change-Id: I72a62b86cba0dfd710f7e1c4c01a3c10710128d8 --- M doc/manuals/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile index d9a613d..2f87b57 100644 --- a/doc/manuals/Makefile +++ b/doc/manuals/Makefile @@ -1,6 +1,6 @@ OSMO_GSM_MANUALS_DIR:=$(shell ./osmo-gsm-manuals-dir.sh) -sdcdir = . +srcdir = . ASCIIDOC = icE1usb-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I72a62b86cba0dfd710f7e1c4c01a3c10710128d8 Gerrit-Change-Number: 22127 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: doc/manuals: support OSMO_GSM_MANUALS_DIR
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22125 ) Change subject: doc/manuals: support OSMO_GSM_MANUALS_DIR .. doc/manuals: support OSMO_GSM_MANUALS_DIR Instead of only relying on pkg-config, support the environment variable and fallback path like in other Osmocom repositories too. The same script is used in other Osmocom repositories where manuals are built without autotools. Related: OS#4912 Change-Id: Iecfbfc2a7588c316642aa37be637cf3c02f76ac4 --- M doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile index 1bd4b6e..d9a613d 100644 --- a/doc/manuals/Makefile +++ b/doc/manuals/Makefile @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR:=$(shell pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir) +OSMO_GSM_MANUALS_DIR:=$(shell ./osmo-gsm-manuals-dir.sh) sdcdir = . diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Iecfbfc2a7588c316642aa37be637cf3c02f76ac4 Gerrit-Change-Number: 22125 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: gitignore: add files from generating manuals
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22126 ) Change subject: gitignore: add files from generating manuals .. gitignore: add files from generating manuals Change-Id: Ibd0089978a7083fb19638d70358c8ef7d589da9c --- A .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..eb3a5e5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/doc/manuals/build +/doc/manuals/common +/doc/manuals/*.pdf -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ibd0089978a7083fb19638d70358c8ef7d589da9c Gerrit-Change-Number: 22126 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-MessageType: merged
Change in osmo-e1-hardware[master]: contrib/jenkins: don't build osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22152 ) Change subject: contrib/jenkins: don't build osmo-gsm-manuals .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ie2f193656386038872adddfbd770ea193ace92e5 Gerrit-Change-Number: 22152 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 14:10:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-e1-hardware[master]: gitignore: add files from generating manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22126 ) Change subject: gitignore: add files from generating manuals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/22126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ibd0089978a7083fb19638d70358c8ef7d589da9c Gerrit-Change-Number: 22126 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-Comment-Date: Wed, 13 Jan 2021 14:09:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: remove duplicate docker_run
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22132 ) Change subject: jobs: remove duplicate docker_run .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I97a4add17d9fa1bd28ab0ceb054b9a8d948b6f86 Gerrit-Change-Number: 22132 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:08:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: update OSMO_GSM_MANUALS_DIR
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22131 ) Change subject: jobs: update OSMO_GSM_MANUALS_DIR .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe91a613162687589e006cba99193606fb8a3eb9 Gerrit-Change-Number: 22131 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:08:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/osmo-gsm-manuals-trigger: new job
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22130 ) Change subject: jobs/osmo-gsm-manuals-trigger: new job .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I104525826068b016b5e06ea52567da4d7beaf7a4 Gerrit-Change-Number: 22130 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Jan 2021 14:07:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ansible: tasks/osmo-ci: clone osmo-gsm-manuals
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22129 ) Change subject: ansible: tasks/osmo-ci: clone osmo-gsm-manuals .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I39a09a4297c7c78357b3d4db4ab89547fa08db59 Gerrit-Change-Number: 22129 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:07:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins.sh: clone osmo-gsm-manuals too
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22128 ) Change subject: contrib/jenkins.sh: clone osmo-gsm-manuals too .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I742fd929e39ca32d6034a30af75b6c8e5b47b233 Gerrit-Change-Number: 22128 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Jan 2021 14:07:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
