March 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-gsm-manuals[master]: chapters/cell-broadcast: Bring up-to-date with reality
by laforge 22 Mar '23

22 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32005 ) Change subject: chapters/cell-broadcast: Bring up-to-date with reality ...................................................................... chapters/cell-broadcast: Bring up-to-date with reality This chapter was written at a time where OsmoCBC and the related BSC support didn't exist yet. Change-Id: If02adf2f9e7beeb7f238ab1c3aa74e8c0155db2b --- M common/chapters/cell-broadcast.adoc 1 file changed, 32 insertions(+), 26 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/cell-broadcast.adoc b/common/chapters/cell-broadcast.adoc index 842e8d1..c1d9581 100644 --- a/common/chapters/cell-broadcast.adoc +++ b/common/chapters/cell-broadcast.adoc @@ -3,7 +3,7 @@ Normally, all user plane data in GSM/GPRS networks are sent in point-to-point channels from the network to the user. Those are called -"dedicated" radio channels which exist between the network and one +_dedicated_ radio channels which exist between the network and one given phone/subscriber at a time. Cell Broadcast is an exception to that rule. It permits user data @@ -35,39 +35,33 @@ === Osmocom Cell Broadcast support -* OsmoBTS implements the "SMS BROADCAST COMMAND" Message in RSL - according to Section 8.5.8 of 3GPP TS 08.58 -* OsmoNITB and OsmoBSC implement a VTY command - `bts <0-255> smscb-command <1-4> HEXSTRING` to send a given hex-formatted cell - broadcast message to a specified BTS +* OsmoBTS implements the `SMS BROADCAST COMMAND` Message in A-bis RSL + according to Section 8.5.8 of 3GPP TS 48.058 +* low-level testing/debugging features +** OsmoNITB and OsmoBSC implement a VTY command + `bts <0-255> smscb-command <1-4> HEXSTRING` to send a given hex-formatted cell + broadcast message to a specified BTS. This can be used for low-level debugging +* proper 3GPP-specified CBS/PWS elements and protocols +** OsmoBSC supports routing and distribution of CBS and warning messages +** OsmoBSC implements the BSC-CBC interface using the CBSP protocol +** OsmoCBC implements the central function of a _Cell Broadcast Centre_, + receiving cell broadcast and warning messages from external entities + via a REST based HTTP interface, and distributing it throughout the + cellular network. +** OsmoCBC implements the BSC-CBC interface using the CBSP protocol (for + 2G/GSM RAN) +** OsmoCBC implements the MME-CBC interface using the SBcAP protocol (for + 4G/LTE RAN) + [mscgen] ---- include::osmocom-cbs.msc[] ---- -==== What's missing - -What's missing (for production operation in larger networks) - -* mechanism to broadcast one (set of) cell broadcast messages from the - BSC to multiple/all BTSs, rather than one BTS individually -* OsmoBTS reporting of current CBCH load -* BSC scheduler scheduling multiple alternating sets of CBCH messages - based on the current CBCH load reported by BTS -* external interface from BSC to a Cell Broadcast Center (CBC), e.g. - according to 3GPP TS 48.049 -* an Osmocom implementation of the Cell Broadcast Center (OsmoCBC) - which can manage and distribute messages to multiple BSCs and which - has an external interface by which cell-broadcast can be entered - into the network - -If you would like to contribute in any of those areas (by means of -code or funding), please reach out to us any time. - === Message Structure -* Each message has a meximum of 15 pages +* Each message has a maximum of 15 pages * Each page is 82 bytes of data, resulting in 93 characters in GSM 7-bit default alphabet * Messages are broadcast on logical channels (more like an address) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If02adf2f9e7beeb7f238ab1c3aa74e8c0155db2b Gerrit-Change-Number: 32005 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: chapters/*: Fix typos
by laforge 22 Mar '23

22 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32006 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: chapters/*: Fix typos ...................................................................... chapters/*: Fix typos Change-Id: I3c5cc64435c808f981d705d1d99c89fde2a6a74e --- M common/chapters/gb-ns2.adoc M common/chapters/glossary.adoc M common/chapters/installation.adoc M common/chapters/logging.adoc M common/chapters/mgwpool.adoc M common/chapters/oap.adoc M common/chapters/preface.adoc M common/chapters/qos-dscp-pcp.adoc 8 files changed, 23 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/common/chapters/gb-ns2.adoc b/common/chapters/gb-ns2.adoc index 925f515..e72fa50 100644 --- a/common/chapters/gb-ns2.adoc +++ b/common/chapters/gb-ns2.adoc @@ -249,7 +249,7 @@ static configuration The static configuration requires to configure all endpoints on the BSS and SGSN. -In constrast the dynamic configuration allows the SGSN to have only a reduced configuration. +In contrast the dynamic configuration allows the SGSN to have only a reduced configuration. ===== Gb over IP "ip.access style" dynamic configuration diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index 7c706b9..bbddcc5 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -136,7 +136,7 @@ GSM tap; pseudo standard for encapsulating GSM protocol layers over UDP/IP for analysis GSUP:: - Generic ubscriber Update Protocol. Osmocom-specific alternative to TCAP/MAP + Generic Subscriber Update Protocol. Osmocom-specific alternative to TCAP/MAP GT:: Global Title; an address in SCCP GTP:: diff --git a/common/chapters/installation.adoc b/common/chapters/installation.adoc index a3193fa..55b7e60 100644 --- a/common/chapters/installation.adoc +++ b/common/chapters/installation.adoc @@ -60,9 +60,9 @@ In general, the usual approach is to -* start with `libosmocore` and all the required librarires and build +* start with `libosmocore` and all the required libraries and build them in order until you have the full chain of dependencies in place. As a final step, build the actual application you want to use. -* perform `autoreconf -fi`, `./confiugre` and `make install` for each of +* perform `autoreconf -fi`, `./configure` and `make install` for each of the projects. Check the `./configure --help` output to see which optional compile-time features you might want to enable or disable. diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index b0a1f5e..a832ca4 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -32,7 +32,7 @@ different category, allowing fine-grained control over which log messages you will or will not see. For example, in OsmoBSC, there are categories for the protocol layers `rsl`, `rr`, `mm`, -`cc` and many others. To get a a list of categories interactively +`cc` and many others. To get a list of categories interactively on the vty, type: `logging level ?` [[log_levels]] diff --git a/common/chapters/mgwpool.adoc b/common/chapters/mgwpool.adoc index c8f2009..c4cf28a 100644 --- a/common/chapters/mgwpool.adoc +++ b/common/chapters/mgwpool.adoc @@ -66,7 +66,7 @@ The VTY implements a 'show mgw-pool' command that lists the currently configured MGW pool members, their status and call utilization. The following snippet shows an output example run on OsmoBSC, but it should be also available on other -applications supporting the MGW pooling VTY featues: +applications supporting the MGW pooling VTY features: ---- OsmoBSC> show mgw-pool @@ -88,7 +88,7 @@ However it is still possible to assign any number from 0-255. The enumeration also may contain gaps. The following snippet shows an output example run on OsmoBSC, but it should be also available on other applications supporting the -MGW pooling VTY featues: +MGW pooling VTY features: ---- OsmoBSC> enable @@ -163,7 +163,7 @@ happens locally to forward the UDP datagrams properly. Also (unless a reset endpoint is configured like in the example config above) there will be no immediate interaction with the MGW. However, the log should at least confirm -the the connect worked and the MGCP client has been created successfully. +the connect worked and the MGCP client has been created successfully. ---- Mon Aug 2 17:15:00 2021 DLMGCP mgcp_client.c:788 MGCP client: using endpoint domain '@mgw' diff --git a/common/chapters/oap.adoc b/common/chapters/oap.adoc index ad91f36..425ff75 100644 --- a/common/chapters/oap.adoc +++ b/common/chapters/oap.adoc @@ -81,7 +81,7 @@ authenticity and validity of the sequence number (included in AUTN), and, if valid, reply with a CHALLENGE_RES message. This shall contain an XRES authentication token generated by milenage from the same random bytes received -from the server and the same shared secet. If the client decides to cancel the +from the server and the same shared secret. If the client decides to cancel the registration (e.g. invalid AUTN), it shall not reply to the CHALLENGE_REQ; a CHALLENGE_ERR message may be sent, but is not mandatory. For example, the client may directly start with a new REGISTER_REQ message. diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc index b8f7e72..272f84a 100644 --- a/common/chapters/preface.adoc +++ b/common/chapters/preface.adoc @@ -117,13 +117,13 @@ is about sharing ideas and code, but also about sharing the effort of software development and maintenance. -If your organization is benefitting from using Osmocom software, please +If your organization is benefiting from using Osmocom software, please consider ways how you can contribute back to that community. Such contributions can be many-fold, for example * sharing your experience about using the software on the public mailing lists, helping to establish best practises in using/operating it, -* providing qualified bug reports, work-arounds +* providing qualified bug reports, workarounds * sharing any modifications to the software you may have made, whether bug fixes or new features, even experimental ones * providing review of patches diff --git a/common/chapters/qos-dscp-pcp.adoc b/common/chapters/qos-dscp-pcp.adoc index 3f97941..81a9e4e 100644 --- a/common/chapters/qos-dscp-pcp.adoc +++ b/common/chapters/qos-dscp-pcp.adoc @@ -77,7 +77,7 @@ header. NOTE:: This means that PCP functionality requires the use of IEEE 802.q -VLAN. You cannot use PCP without VLAN +VLAN. You cannot use PCP without VLAN. The Linux kernel assigns IEEE 802.1q PCP bits based on a _mapping_ between the _priority_ and the PCP value. Each VLAN network device @@ -148,7 +148,7 @@ . configure the osmocom program to set the DSCP value . use the default DSCP -> priority mapping, if possible -. configure an egrees QoS map to map from priority to PCP +. configure an egress QoS map to map from priority to PCP If the desired combination of DSCP + PCP cannot be achieved that way, due to the rather static default kernel mapping table, one needs to go @@ -156,6 +156,6 @@ . configure the osmocom program to set the DSCP value . use packet filter rules to set the priority based on DSCP -. configure an egrees QoS map to map from priority to PCP +. configure an egress QoS map to map from priority to PCP include::{srcdir}/chapters/qos-example.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3c5cc64435c808f981d705d1d99c89fde2a6a74e Gerrit-Change-Number: 32006 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: chapters/mncc: Update the wording to be less confusing and more up-to...
by laforge 22 Mar '23

22 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32003 ) Change subject: chapters/mncc: Update the wording to be less confusing and more up-to-date ...................................................................... chapters/mncc: Update the wording to be less confusing and more up-to-date Change-Id: Ic8876509878e565f140508dc2e3494b0e21c566c --- M common/chapters/mncc.adoc 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/mncc.adoc b/common/chapters/mncc.adoc index 3c67998..e897294 100644 --- a/common/chapters/mncc.adoc +++ b/common/chapters/mncc.adoc @@ -56,10 +56,11 @@ to disable the internal MNCC handler and specify the MNCC socket path in the configuration file. -At the time of this writing, the only external application implementing the -MNCC interface compatible with the Osmocom MNCC socket is `lcr`, the Linux Call -Router. More widespread integration of external call routing is available via -the OsmoSIPConnector. +At the time of this writing, there are only two known open source applications implementing the +MNCC interface compatible with the Osmocom MNCC socket: + +* historically `lcr`, the Linux Call Router (support for modern MNCC protocol versions may be missing) +* `osmo-sip-connector`, the more up-to-date integration of external call routing by translating MNCC into a SIP trunk towards an external SIP PBX / switch. === DTMF considerations -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8876509878e565f140508dc2e3494b0e21c566c Gerrit-Change-Number: 32003 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in osmo-gsm-manuals[master]: chapters/cell-broadcast: Bring up-to-date with reality
by laforge 22 Mar '23

22 Mar '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32005 ) Change subject: chapters/cell-broadcast: Bring up-to-date with reality ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If02adf2f9e7beeb7f238ab1c3aa74e8c0155db2b Gerrit-Change-Number: 32005 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 22 Mar 2023 09:20:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-manuals[master]: chapters/mncc: Update the wording to be less confusing and more up-to...
by laforge 22 Mar '23

22 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32003 ) Change subject: chapters/mncc: Update the wording to be less confusing and more up-to-date ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8876509878e565f140508dc2e3494b0e21c566c Gerrit-Change-Number: 32003 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Mar 2023 09:20:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-manuals[master]: chapters/abis: clarify which tool is used on what BTS model
by fixeria 22 Mar '23

22 Mar '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32004 ) Change subject: chapters/abis: clarify which tool is used on what BTS model ...................................................................... Patch Set 1: (1 comment) File common/chapters/abis.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32004/comment/436bb3fc_54a7… PS1, Line 41: or in general : any BTS using `osmo-bts` > Because tcp/3006 is basically an _additional_ supplementary interface for finding/configuring ip. […] I meant udp/3006 of course. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I256b38ff78e88529e9eb045f7b299a46e552f3f8 Gerrit-Change-Number: 32004 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 22 Mar 2023 09:19:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-manuals[master]: chapters/abis: clarify which tool is used on what BTS model
by fixeria 22 Mar '23

22 Mar '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32004 ) Change subject: chapters/abis: clarify which tool is used on what BTS model ...................................................................... Patch Set 1: (1 comment) File common/chapters/abis.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32004/comment/ba3d3fb1_aabc… PS1, Line 41: or in general : any BTS using `osmo-bts` > oh, then that's a bug. I don't really see why some osmo-bts models wouldn't respond to abisip-find. […] Because tcp/3006 is basically an _additional_ supplementary interface for finding/configuring ip.access units (used by `ipaccess-config`). It requires additional implementation (at least handling of the `IPAC_MSGT_ID_GET`), which is missing in osmo-bts-{trx,octphy,virtual}. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I256b38ff78e88529e9eb045f7b299a46e552f3f8 Gerrit-Change-Number: 32004 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 22 Mar 2023 09:18:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: jobs/master-builds: use debian-bullseye-jenkins
by osmith 22 Mar '23

22 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32000 ) Change subject: jobs/master-builds: use debian-bullseye-jenkins ...................................................................... jobs/master-builds: use debian-bullseye-jenkins I've verified that all master-builds jobs still work with this change. Related: OS#5949 Depends: docker-playground I51925d0ab9e5a779379efab59c381ef12fb60929 Change-Id: I7d5bc7bb4c1457d4e05fd6e0d27668382c39973a --- M jobs/master-builds.yml 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 008452a..23e5219 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -63,7 +63,7 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-buster-jenkins' + docker_img: '$USER/debian-bullseye-jenkins' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7d5bc7bb4c1457d4e05fd6e0d27668382c39973a Gerrit-Change-Number: 32000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: scripts/docker-rebuild: add debian-bullseye-jenkins-arm
by osmith 22 Mar '23

22 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31999 ) Change subject: scripts/docker-rebuild: add debian-bullseye-jenkins-arm ...................................................................... scripts/docker-rebuild: add debian-bullseye-jenkins-arm Prepare to let all master-builds jobs use debian-bullseye instead of debian-buster. Depends: docker-playground I8e1741f86ffb8abd658d1e4e0415dfd11fb1a8a1 Related: OS#5949 Change-Id: I55bd5869ecd753549b8f2f2822e825623d940acd --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 57005ed..ced9ce8 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -12,6 +12,7 @@ ;; arm*) docker_images_require \ + "debian-bullseye-jenkins-arm" \ "debian-buster-jenkins-arm" ;; esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I55bd5869ecd753549b8f2f2822e825623d940acd Gerrit-Change-Number: 31999 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in docker-playground[master]: debian-bullseye-jenkins: sync with buster-jenkins
by osmith 22 Mar '23

22 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31997 ) Change subject: debian-bullseye-jenkins: sync with buster-jenkins ...................................................................... debian-bullseye-jenkins: sync with buster-jenkins Prepare to let jenkins master-builds use debian-bullseye-jenkins instead of debian-buster-jenkins. Add almost everything from the buster Dockerfile to the bullseye Dockerfile that is not there, except for: dh-systemd (not available in debian11) Also add python2, as some projects still require it to run tests (OS#5950). Related: OS#5949 Change-Id: I51925d0ab9e5a779379efab59c381ef12fb60929 --- M debian-bullseye-jenkins/Dockerfile 1 file changed, 56 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile index 71ee08c..7c02cbe 100644 --- a/debian-bullseye-jenkins/Dockerfile +++ b/debian-bullseye-jenkins/Dockerfile @@ -12,6 +12,9 @@ # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr… ARG DEBIAN_VERSION +# LLVM-embedded-toolchain-for-Arm version +ARG LLVM_VERSION="14.0.0" + # Install apt dependencies (keep in alphabetic order) RUN \ [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \ @@ -27,6 +30,7 @@ bison \ bzip2 \ ca-certificates \ + ccache \ cmake \ coccinelle \ cppcheck \ @@ -43,11 +47,13 @@ gawk \ gcc \ gcc-arm-none-eabi \ + ghostscript \ git \ git-buildpackage \ graphviz \ htop \ inkscape \ + latexmk \ lcov \ libaio-dev \ libasound2-dev \ @@ -82,6 +88,7 @@ libsqlite3-dev \ libssl-dev \ libtalloc-dev \ + libtinfo5 \ libtool \ libusb-1.0-0-dev \ libusb-dev \ @@ -97,6 +104,8 @@ patchelf \ picolibc-arm-none-eabi \ pkg-config \ + python-setuptools \ + python2.7 \ python3 \ python3-gi \ python3-mako \ @@ -114,17 +123,34 @@ sudo \ systemd \ tcpdump \ + tex-gyre \ texinfo \ unzip \ wget \ xsltproc +RUN set -x && \ + [ "$(arch)" = "x86_64" ] || exit 0; \ + wget -q https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/do… && \ + tar -xf LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + rm LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + mv LLVMEmbeddedToolchainForArm-${LLVM_VERSION} /opt/llvm-arm && \ + /opt/llvm-arm/bin/clang --version && \ + /opt/llvm-arm/bin/clang --print-targets + # Install pip dependencies (keep in alphabetic order) RUN pip3 install \ - git+https://github.com/podshumok/python-smpplib.git \ - git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ - pydbus \ - pysispm + 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git' \ + 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ + 'git+https://github.com/podshumok/python-smpplib.git' \ + 'pydbus' \ + 'pylint' \ + 'pysispm' \ + 'sphinx' \ + 'sphinxcontrib-napoleon' \ + 'swig' +ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt +RUN pip3 install -r /tmp/pysim_requirements.txt # match the outside user RUN useradd --uid=1000 build @@ -133,6 +159,14 @@ RUN mkdir /build RUN chown build:build /build +# Install osmo-python-tests for python2 (OS#5950) +ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed +ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit +RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ + cd osmo-python-tests2 && \ + git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ + python2 setup.py clean build install + # Install osmo-python-tests for python3 ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I51925d0ab9e5a779379efab59c381ef12fb60929 Gerrit-Change-Number: 31997 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0