- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: osmocom-bb-host-master: modernize
by osmith 13 May '22

13 May '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28101 ) Change subject: osmocom-bb-host-master: modernize ...................................................................... osmocom-bb-host-master: modernize Do not set up the Osmocom repository inside osmocom-bb-host-master, it is done in debian-bullseye-build. Without this patch, we actually installed the debian 9 version of libosmocore-dev in the debian 11 container. This is part 1/2 of fixing TTCN3-centos-bts-test, which has been failing since OSMOCOM_REPO_MIRROR was changed in osmo-ci.git. Part 2 is in osmo-ci I8201f34a0f9747eea78c358a626cc3981d7407c4. Change-Id: I78e0445a1b82e5cd72ecaa86e8fe25516b19f485 --- M osmocom-bb-host-master/Dockerfile 1 file changed, 0 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 3f9c108..21c7f31 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -1,24 +1,10 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" - -MAINTAINER Harald Welte <laforge(a)gnumonks.org> - ARG OSMO_BB_BRANCH="master" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY .common/Release.key /tmp/Release.key - -RUN apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list - -ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ libosmocore-dev && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I78e0445a1b82e5cd72ecaa86e8fe25516b19f485 Gerrit-Change-Number: 28101 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in docker-playground[master]: osmocom-bb-host-master: modernize
by osmith 13 May '22

13 May '22

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28101 ) Change subject: osmocom-bb-host-master: modernize ...................................................................... Patch Set 1: Code-Review+2 (2 comments) Patchset: PS1: 1+1=2 File osmocom-bb-host-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/28101/comment/ea6635ca_411… PS1, Line 9: MAINTAINER Harald Welte <laforge(a)gnumonks.org> > Good to know, thanks! grep shows that we still use it quite a lot, so I think we may want to remove […] => https://gerrit.osmocom.org/c/docker-playground/+/28106 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I78e0445a1b82e5cd72ecaa86e8fe25516b19f485 Gerrit-Change-Number: 28101 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 16:19:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: */Dockerfile: drop MAINTAINER line
by osmith 13 May '22

13 May '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28106 ) Change subject: */Dockerfile: drop MAINTAINER line ...................................................................... */Dockerfile: drop MAINTAINER line MAINTAINER is deprecated, drop the line in all Dockerfiles as suggested by Vadim. Related: https://docs.docker.com/engine/reference/builder/#maintainer-deprecated Change-Id: If1ef3032af2075d792c526ae744ec4c0c091da3a --- M alpine-build/Dockerfile M alpine-lighttpd/Dockerfile M arm-none-eabi-gcc-4.8.2/Dockerfile M debian-bullseye-erlang/Dockerfile M debian-bullseye-titan/Dockerfile M debian-buster-simtrace2/Dockerfile M debian-jessie-build/Dockerfile M debian-jessie-buildslave/Dockerfile M debian-jessie-osmocom/Dockerfile M debian-sid-build/Dockerfile M fpga-build/Dockerfile M git-daemon/Dockerfile M gr-gsm-master/Dockerfile M nplab-m3ua-test/Dockerfile M nplab-sua-test/Dockerfile M open5gs-latest/Dockerfile M open5gs-master/Dockerfile M openbts-umts/Dockerfile M osmo-dev-on-debian-sid/Dockerfile M osmo-gerrit-libosmo/Dockerfile M osmo-gsm-tester/Dockerfile M osmo-ran/Dockerfile M osmo-ran/split/ran-bsc_mgw/Dockerfile M osmo-ran/split/ran-bts_pcu/Dockerfile M osmo-ran/split/ran-trx-ipc/Dockerfile M osmo-ran/split/ran-trx-uhd/Dockerfile M sctp-test/Dockerfile M sigtran-tests/Dockerfile M systemd/Dockerfile M ubuntu-zesty-build/Dockerfile 30 files changed, 0 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/06/28106/1 diff --git a/alpine-build/Dockerfile b/alpine-build/Dockerfile index 26b8d29..f115842 100644 --- a/alpine-build/Dockerfile +++ b/alpine-build/Dockerfile @@ -1,7 +1,6 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/alpine:3.6 -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apk update && \ apk upgrade diff --git a/alpine-lighttpd/Dockerfile b/alpine-lighttpd/Dockerfile index f693e8a..6029a8e 100644 --- a/alpine-lighttpd/Dockerfile +++ b/alpine-lighttpd/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:latest -MAINTAINER Harald Welte <laforge(a)gnumonks.org> EXPOSE 80 diff --git a/arm-none-eabi-gcc-4.8.2/Dockerfile b/arm-none-eabi-gcc-4.8.2/Dockerfile index 6c1373c..3016e73 100644 --- a/arm-none-eabi-gcc-4.8.2/Dockerfile +++ b/arm-none-eabi-gcc-4.8.2/Dockerfile @@ -1,6 +1,5 @@ FROM debian:stretch -MAINTAINER Vadim Yanitskiy <axilirator(a)gmail.com> ENV BINUTILS_SRC=http://ftp.gnu.org/gnu/binutils/binutils-2.21.1a.tar.bz2 ENV NEWLIB_SRC=https://sourceware.org/pub/newlib/newlib-1.19.0.tar.gz diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index 15da137..aeff1c7 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -4,7 +4,6 @@ ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" -MAINTAINER Harald Welte <laforge(a)gnumonks.org> ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/" diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 16b25b9..5ee3a06 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -4,7 +4,6 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" -MAINTAINER Harald Welte <laforge(a)gnumonks.org> ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/" diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile index a8765b9..71309b5 100644 --- a/debian-buster-simtrace2/Dockerfile +++ b/debian-buster-simtrace2/Dockerfile @@ -4,7 +4,6 @@ ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" -MAINTAINER Harald Welte <laforge(a)gnumonks.org> ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/" diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index 141d258..e101a13 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -1,7 +1,6 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:jessie -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/debian-jessie-buildslave/Dockerfile b/debian-jessie-buildslave/Dockerfile index 98d70a9..a00fc47 100644 --- a/debian-jessie-buildslave/Dockerfile +++ b/debian-jessie-buildslave/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-jessie-build -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN [ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \ apt-get update && \ diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile index d95e249..08fb320 100644 --- a/debian-jessie-osmocom/Dockerfile +++ b/debian-jessie-osmocom/Dockerfile @@ -4,7 +4,6 @@ ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" -MAINTAINER Harald Welte <laforge(a)gnumonks.org> ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0/" diff --git a/debian-sid-build/Dockerfile b/debian-sid-build/Dockerfile index f4fe990..5610833 100644 --- a/debian-sid-build/Dockerfile +++ b/debian-sid-build/Dockerfile @@ -1,7 +1,6 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:sid -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index 135af71..6e975a7 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-buster-build -MAINTAINER Harald Welte <laforge(a)gnumonks.org> ARG FPGA_TOOLCHAIN_DATE=20200914 ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 diff --git a/git-daemon/Dockerfile b/git-daemon/Dockerfile index 9c4601b..2ddb5a9 100644 --- a/git-daemon/Dockerfile +++ b/git-daemon/Dockerfile @@ -1,5 +1,4 @@ FROM debian:latest -MAINTAINER laforge(a)gnumonks.org ENV DEBIAN_FRONTEND noninteractive diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index 5e878c1..f0e4e97 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -2,7 +2,6 @@ ARG USER FROM $USER/debian-bullseye-build -MAINTAINER Vadim Yanitskiy <axilirator(a)gmail.com> RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile index db993bd..1a53329 100644 --- a/nplab-m3ua-test/Dockerfile +++ b/nplab-m3ua-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER=osmocom-build FROM $USER/sigtran-tests -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN cd /tmp && git clone git://git.osmocom.org/nplab/m3ua-testtool ADD http://git.osmocom.org/nplab/m3ua-testtool/patch/?h=laforge/python3 /tmp/commit diff --git a/nplab-sua-test/Dockerfile b/nplab-sua-test/Dockerfile index d62f665..931623b 100644 --- a/nplab-sua-test/Dockerfile +++ b/nplab-sua-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER=osmocom-build FROM $USER/sigtran-tests -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN cd /tmp && git clone git://git.osmocom.org/nplab/sua-testtool ADD http://git.osmocom.org/nplab/sua-testtool/patch/?h=laforge/python3 /tmp/commit diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index 66683b9..e8424de 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -1,7 +1,6 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:buster -MAINTAINER Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 0e73559..1aea492 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -2,7 +2,6 @@ ARG USER FROM $USER/debian-bullseye-build -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/openbts-umts/Dockerfile b/openbts-umts/Dockerfile index b3fd386..0fee2ff 100644 --- a/openbts-umts/Dockerfile +++ b/openbts-umts/Dockerfile @@ -3,7 +3,6 @@ # Ancient software requires ancient distro FROM debian:jessie -MAINTAINER Vadim Yanitskiy <axilirator(a)gmail.com> RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/osmo-dev-on-debian-sid/Dockerfile b/osmo-dev-on-debian-sid/Dockerfile index bc65f9c..81ba3cd 100644 --- a/osmo-dev-on-debian-sid/Dockerfile +++ b/osmo-dev-on-debian-sid/Dockerfile @@ -1,6 +1,5 @@ FROM neels/debian-sid-build -MAINTAINER Neels Hofmeyr <nhofmeyr(a)sysmocom.de> WORKDIR /build diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile index 1b98c9f..1478e75 100644 --- a/osmo-gerrit-libosmo/Dockerfile +++ b/osmo-gerrit-libosmo/Dockerfile @@ -6,7 +6,6 @@ ARG USER FROM $USER/debian-jessie-buildslave -MAINTAINER Harald Welte <laforge(a)gnumonks.org> USER build WORKDIR /build diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index a584faa..052c565 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -2,7 +2,6 @@ FROM $USER/debian-buster-jenkins ARG OGT_MASTER_ADDR="172.18.50.2" -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> # Create jenkins user RUN useradd -ms /bin/bash jenkins diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile index 61978ed..64697c6 100644 --- a/osmo-ran/Dockerfile +++ b/osmo-ran/Dockerfile @@ -6,7 +6,6 @@ ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile index 0cf8347..e0e3b15 100644 --- a/osmo-ran/split/ran-bsc_mgw/Dockerfile +++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile @@ -6,7 +6,6 @@ ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile index e49b8b1..d8b9bcd 100644 --- a/osmo-ran/split/ran-bts_pcu/Dockerfile +++ b/osmo-ran/split/ran-bts_pcu/Dockerfile @@ -6,7 +6,6 @@ ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile index bcd84cb..e273da9 100644 --- a/osmo-ran/split/ran-trx-ipc/Dockerfile +++ b/osmo-ran/split/ran-trx-ipc/Dockerfile @@ -6,7 +6,6 @@ ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile index 08baa07..adc764a 100644 --- a/osmo-ran/split/ran-trx-uhd/Dockerfile +++ b/osmo-ran/split/ran-trx-uhd/Dockerfile @@ -6,7 +6,6 @@ ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" diff --git a/sctp-test/Dockerfile b/sctp-test/Dockerfile index 7ba92bf..4015fe6 100644 --- a/sctp-test/Dockerfile +++ b/sctp-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-bullseye-build -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile index d7f7206..51cff39 100644 --- a/sigtran-tests/Dockerfile +++ b/sigtran-tests/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-buster-build -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apt-get update && apt-get -y install \ guile-2.0 guile-2.0-dev gnulib tcsh \ diff --git a/systemd/Dockerfile b/systemd/Dockerfile index 63d4c40..542b38c 100644 --- a/systemd/Dockerfile +++ b/systemd/Dockerfile @@ -4,7 +4,6 @@ # Arguments used after FROM must be specified again ARG DISTRO -MAINTAINER Pau Espin Pedrol <pespin(a)sysmocom.de> # set up systemd # container=docker: systemd likes to know it is running inside a container diff --git a/ubuntu-zesty-build/Dockerfile b/ubuntu-zesty-build/Dockerfile index cfda27f..ee95bd7 100644 --- a/ubuntu-zesty-build/Dockerfile +++ b/ubuntu-zesty-build/Dockerfile @@ -1,7 +1,6 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/ubuntu:zesty -MAINTAINER Harald Welte <laforge(a)gnumonks.org> RUN apt-get update && \ apt-get upgrade -y && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If1ef3032af2075d792c526ae744ec4c0c091da3a Gerrit-Change-Number: 28106 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append IMEISV IE to CreatePdpCtxReq
by pespin 13 May '22

13 May '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 ) Change subject: ggsn: Append IMEISV IE to CreatePdpCtxReq ...................................................................... ggsn: Append IMEISV IE to CreatePdpCtxReq Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 39 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index e3d9341..c1ef7fb 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -99,7 +99,8 @@ OCT4 teic_remote, OCT1 ratType optional, UserLocationInformation uli optional, - OCT2 charging_char optional + OCT2 charging_char optional, + OCT8 imeisv optional } type component GT_CT { @@ -332,6 +333,11 @@ return int2oct(f_rnd_int(4294967296), 4); } + /* return random IMEI(SV) */ + function f_rnd_imeisv() return OCT8 { + return hex2oct(f_rnd_hexstring(16, 10)); + } + /* define an (internal) representation of a PDP context */ template PdpContext t_DefinePDP(hexstring imsi, octetstring msisdn, octetstring apn, EndUserAddress eua, OCT1 ratType := '02'O /* GERAN */) := { @@ -352,7 +358,8 @@ geographicLocationCGI := ts_GeographicLocationCGI('262'H, '42F'H, '0001'O, '0002'O) } }, - charging_char := '0000'O + charging_char := '0000'O, + imeisv := f_rnd_imeisv() } /* send GTP-C for a given context and increment sequence number */ @@ -513,7 +520,7 @@ f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, - ctx.uli, ctx.charging_char)); + ctx.uli, ctx.charging_char, ctx.imeisv)); T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected")) { @@ -2009,7 +2016,7 @@ ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, - ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char)); + ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char, ctx[next_req_ctx].imeisv)); next_req_ctx := next_req_ctx + 1; if (next_req_ctx < num_ctx) { T_next.start; @@ -2123,7 +2130,7 @@ ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, - ctx.uli, ctx.charging_char)); + ctx.uli, ctx.charging_char, ctx.imeisv)); next_req_ctx := next_req_ctx + 1; } T_next.start; diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 0c5c003..22d8632 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -119,6 +119,26 @@ restartCounter := restart_counter } + /* IMEI(SV) IE TS 29.060 7.7.53 */ + template IMEISV_gtpc ts_IMEISV(template (value) OCT8 imeisv) := { + type_gtpc := '9A'O, + lengthf := 8, + imeisv := imeisv + } + private function f_ts_IMEISV(template (omit) OCT8 imeisv) + return template (omit) IMEISV_gtpc { + if (istemplatekind(imeisv, "omit")) { + return omit; + } + return ts_IMEISV(imeisv); + } + + template IMEISV_gtpc tr_IMEISV(template (present) OCT8 imeisv) := { + type_gtpc := '9A'O, + lengthf := 8, + imeisv := imeisv + } + /* Charging Characteristics IE TS 29.060 7.7.23 */ template ChargingCharacteristics_GTPC ts_ChargingCharacteristics(template (value) OCT2 chargingChar) := { type_gtpc := '1A'O, @@ -379,7 +399,8 @@ octetstring msisdn, template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, template (omit) UserLocationInformation uli := omit, - template (omit) OCT2 charging_char := omit) := { + template (omit) OCT2 charging_char := omit, + template (omit) OCT8 imeisv := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -421,7 +442,7 @@ ratType := f_ts_RATType(ratType), userLocationInformation := uli, mS_TimeZone := omit, - imeisv := omit, + imeisv := f_ts_IMEISV(imeisv), camelChargingInformationContainer := omit, additionalTraceInfo := omit, correlationID := omit, @@ -443,12 +464,14 @@ template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, template (omit) UserLocationInformation uli := omit, - template (omit) OCT2 charging_char := omit) := { + template (omit) OCT2 charging_char := omit, + template (omit) OCT8 imeisv := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco, ratType, uli, charging_char)), seq) + sgsn_ip_data, msisdn, pco, ratType, uli, + charging_char, imeisv)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e Gerrit-Change-Number: 28105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append IMEISV IE to CreatePdpCtxReq
by fixeria 13 May '22

13 May '22

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 ) Change subject: ggsn: Append IMEISV IE to CreatePdpCtxReq ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File ggsn_tests/GGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105/comment/6627655d_53ba… PS1, Line 338: return int2oct(f_rnd_int(18446744073709551616), 8); > There is a more elegant way to do this (see Osmocom_Types.f_rnd_imsi()): […] Done File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105/comment/f7724c9a_3379… PS1, Line 129: > Usually no tab here, so function body is visually separated from its declaration. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e Gerrit-Change-Number: 28105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 15:44:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append IMEISV IE to CreatePdpCtxReq
by pespin 13 May '22

13 May '22

Attention is currently required from: osmith, pespin. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 to look at the new patch set (#2). Change subject: ggsn: Append IMEISV IE to CreatePdpCtxReq ...................................................................... ggsn: Append IMEISV IE to CreatePdpCtxReq Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 39 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/28105/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e Gerrit-Change-Number: 28105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append IMEISV IE to CreatePdpCtxReq
by fixeria 13 May '22

13 May '22

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 ) Change subject: ggsn: Append IMEISV IE to CreatePdpCtxReq ...................................................................... Patch Set 1: (2 comments) File ggsn_tests/GGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105/comment/8d174739_b965… PS1, Line 338: return int2oct(f_rnd_int(18446744073709551616), 8); There is a more elegant way to do this (see Osmocom_Types.f_rnd_imsi()): return hex2oct(f_rnd_hexstring(16, 10)); File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105/comment/0a914183_227b… PS1, Line 129: Usually no tab here, so function body is visually separated from its declaration. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e Gerrit-Change-Number: 28105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 15:23:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append IMEISV IE to CreatePdpCtxReq
by pespin 13 May '22

13 May '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 ) Change subject: ggsn: Append IMEISV IE to CreatePdpCtxReq ...................................................................... ggsn: Append IMEISV IE to CreatePdpCtxReq Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 39 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/28105/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index e3d9341..b813960 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -99,7 +99,8 @@ OCT4 teic_remote, OCT1 ratType optional, UserLocationInformation uli optional, - OCT2 charging_char optional + OCT2 charging_char optional, + OCT8 imeisv optional } type component GT_CT { @@ -332,6 +333,11 @@ return int2oct(f_rnd_int(4294967296), 4); } + /* return random IMEI(SV) */ + function f_rnd_imeisv() return OCT8 { + return int2oct(f_rnd_int(18446744073709551616), 8); + } + /* define an (internal) representation of a PDP context */ template PdpContext t_DefinePDP(hexstring imsi, octetstring msisdn, octetstring apn, EndUserAddress eua, OCT1 ratType := '02'O /* GERAN */) := { @@ -352,7 +358,8 @@ geographicLocationCGI := ts_GeographicLocationCGI('262'H, '42F'H, '0001'O, '0002'O) } }, - charging_char := '0000'O + charging_char := '0000'O, + imeisv := f_rnd_imeisv() } /* send GTP-C for a given context and increment sequence number */ @@ -513,7 +520,7 @@ f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, - ctx.uli, ctx.charging_char)); + ctx.uli, ctx.charging_char, ctx.imeisv)); T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected")) { @@ -2009,7 +2016,7 @@ ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, - ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char)); + ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char, ctx[next_req_ctx].imeisv)); next_req_ctx := next_req_ctx + 1; if (next_req_ctx < num_ctx) { T_next.start; @@ -2123,7 +2130,7 @@ ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, - ctx.uli, ctx.charging_char)); + ctx.uli, ctx.charging_char, ctx.imeisv)); next_req_ctx := next_req_ctx + 1; } T_next.start; diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 0c5c003..5156510 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -119,6 +119,26 @@ restartCounter := restart_counter } + /* IMEI(SV) IE TS 29.060 7.7.53 */ + template IMEISV_gtpc ts_IMEISV(template (value) OCT8 imeisv) := { + type_gtpc := '9A'O, + lengthf := 8, + imeisv := imeisv + } + private function f_ts_IMEISV(template (omit) OCT8 imeisv) + return template (omit) IMEISV_gtpc { + if (istemplatekind(imeisv, "omit")) { + return omit; + } + return ts_IMEISV(imeisv); + } + + template IMEISV_gtpc tr_IMEISV(template (present) OCT8 imeisv) := { + type_gtpc := '9A'O, + lengthf := 8, + imeisv := imeisv + } + /* Charging Characteristics IE TS 29.060 7.7.23 */ template ChargingCharacteristics_GTPC ts_ChargingCharacteristics(template (value) OCT2 chargingChar) := { type_gtpc := '1A'O, @@ -379,7 +399,8 @@ octetstring msisdn, template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, template (omit) UserLocationInformation uli := omit, - template (omit) OCT2 charging_char := omit) := { + template (omit) OCT2 charging_char := omit, + template (omit) OCT8 imeisv := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -421,7 +442,7 @@ ratType := f_ts_RATType(ratType), userLocationInformation := uli, mS_TimeZone := omit, - imeisv := omit, + imeisv := f_ts_IMEISV(imeisv), camelChargingInformationContainer := omit, additionalTraceInfo := omit, correlationID := omit, @@ -443,12 +464,14 @@ template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, template (omit) UserLocationInformation uli := omit, - template (omit) OCT2 charging_char := omit) := { + template (omit) OCT2 charging_char := omit, + template (omit) OCT8 imeisv := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco, ratType, uli, charging_char)), seq) + sgsn_ip_data, msisdn, pco, ratType, uli, + charging_char, imeisv)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I00975328e94afd116e59c88fd96c5b0154810a1e Gerrit-Change-Number: 28105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: acc: Simplify start/stop by using new signal S_NM_RUNNING_CHG
by pespin 13 May '22

13 May '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28079 ) Change subject: acc: Simplify start/stop by using new signal S_NM_RUNNING_CHG ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e09bcb18a6c3bb2e88bba98579fb4854a6b0699 Gerrit-Change-Number: 28079 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 14:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: coding: Use ARRAY_SIZE macro
by pespin 13 May '22

13 May '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28104 ) Change subject: coding: Use ARRAY_SIZE macro ...................................................................... coding: Use ARRAY_SIZE macro Change-Id: I6b7a2a3a7be6a1d92038ff3b249e539fcd0f639e --- M src/coding/gsm0503_coding.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 493f957..3ad2861 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -547,7 +547,7 @@ return res; coded_len = osmo_conv_encode(code, output, recoded); - OSMO_ASSERT(sizeof(recoded) / sizeof(recoded[0]) >= coded_len); + OSMO_ASSERT(ARRAY_SIZE(recoded) >= coded_len); /* Count bit errors */ if (n_errors) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b7a2a3a7be6a1d92038ff3b249e539fcd0f639e Gerrit-Change-Number: 28104 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log