April 2025 - gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: sctp_{client,server}: accept arguments in form of a map

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40016?usp=email ) Change subject: sctp_{client,server}: accept arguments in form of a map ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I07c7365181037ee36c1bce73e91f7bafa7f7f0cf Gerrit-Change-Number: 40016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:27:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[XS] Change in docker-playground[master]: osmo-ns-master: build without uring for debian 10

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40020?usp=email ) Change subject: osmo-ns-master: build without uring for debian 10 ...................................................................... osmo-ns-master: build without uring for debian 10 In preparation for running FR tests with debian 10, adjust osmo-ns-master to build libosmocore without uring support as liburing-dev is not packaged for debian 10. Related: OS#6494#note-19 Change-Id: I1278bc3435c791c429b38a21b53c8efe20e741df --- M osmo-ns-master/Dockerfile 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-ns-master/Dockerfile b/osmo-ns-master/Dockerfile index b5164a6..35e360d 100644 --- a/osmo-ns-master/Dockerfile +++ b/osmo-ns-master/Dockerfile @@ -25,12 +25,17 @@ RUN git clone https://gerrit.osmocom.org/libosmocore.git ADD https://gerrit.osmocom.org/plugins/gitiles/libosmocore/+/$LIBOSMOCORE_BRANC… /tmp/commit-libosmocore -RUN cd libosmocore && \ +RUN set -x && \ + cd libosmocore && \ git fetch && git checkout $LIBOSMOCORE_BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$LIBOSMOCORE_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure --disable-doxygen --disable-pcsc --enable-external-tests && \ + CONFIGURE_FLAGS="--disable-doxygen --disable-pcsc --enable-external-tests" && \ + if [ "$DISTRO" = "debian-buster" ]; then \ + CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring"; \ + fi && \ + ./configure $CONFIGURE_FLAGS && \ make "-j$(nproc)" install && \ install -m 0755 utils/.libs/osmo-ns-dummy /usr/local/bin/osmo-ns-dummy && \ /sbin/ldconfig -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40020?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1278bc3435c791c429b38a21b53c8efe20e741df Gerrit-Change-Number: 40020 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in docker-playground[master]: debian-buster-obs-latest: new container

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40024?usp=email ) Change subject: debian-buster-obs-latest: new container ...................................................................... debian-buster-obs-latest: new container Add this container in preparation for running ttcn3-gbproxy-test-fr-latest with debian 10. Related: OS#6494#note-19 Change-Id: I38c3ecb5cd40a6f67901388068ec1c8316a70fd4 --- A debian-buster-obs-latest/Dockerfile A debian-buster-obs-latest/Makefile 2 files changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-buster-obs-latest/Dockerfile b/debian-buster-obs-latest/Dockerfile new file mode 100644 index 0000000..4a0d3b0 --- /dev/null +++ b/debian-buster-obs-latest/Dockerfile @@ -0,0 +1,38 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:buster +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_10/" +ARG UID + +# Copy from common dir +COPY .common/respawn.sh /usr/local/bin/respawn.sh +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc + +# Configure build user, disable installing man pages +# * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} -d /build -m build && \ + chown -R build:build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Configure Osmocom latest repository, add telnet for debugging +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + telnet \ + && \ + apt-get clean && \ + echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO/Release /tmp/Release diff --git a/debian-buster-obs-latest/Makefile b/debian-buster-obs-latest/Makefile new file mode 100644 index 0000000..67066b3 --- /dev/null +++ b/debian-buster-obs-latest/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:buster +DISTRO=debian-buster +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I38c3ecb5cd40a6f67901388068ec1c8316a70fd4 Gerrit-Change-Number: 40024 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months

1
0
0 0

[XS] Change in docker-playground[master]: jenkins-common: support {latest,master}-debian10

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40021?usp=email ) Change subject: jenkins-common: support {latest,master}-debian10 ...................................................................... jenkins-common: support {latest,master}-debian10 It is required that we run the FR tests with debian 10. Adjust jenkins-common.sh so we can use IMAGE_SUFFIX=master-debian10 and IMAGE_SUFFIX=latest-debian10. The related osmo-ci patch will configure jenkins to make use of this. Related: OS#6494#note-19 Related: osmo-ci Ibd4cb705048ef5c39fa4192870e2b0f0d067842f Change-Id: I1a41ca8ddd06f716c4bf29d60a0c2f0f82dc4e35 --- M jenkins-common.sh 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index acdf262..36dd831 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -23,6 +23,8 @@ osmo-*-latest-centos8) echo "centos8-obs-latest" ;; osmo-*-centos7) echo "centos7-build" ;; osmo-*-centos8) echo "centos8-build" ;; + osmo-*-latest-debian10) echo "debian-buster-obs-latest" ;; + osmo-*-debian10) echo "debian-buster-build" ;; osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; osmo-*-asan) echo "debian-$DEBIAN_DEFAULT-obs-asan" ;; osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; @@ -40,6 +42,7 @@ osmo-*-centos8) echo "centos8" ;; centos7-*) echo "centos7" ;; centos8-*) echo "centos8" ;; + osmo-*-debian10) echo "debian-buster" ;; debian-buster-*) echo "debian-buster" ;; debian-bullseye-*) echo "debian-bullseye" ;; debian-bookworm-*) echo "debian-bookworm" ;; @@ -53,6 +56,7 @@ osmo-*-centos8) echo "almalinux:8"; ;; centos7-*) echo "centos:centos7" ;; centos8-*) echo "almalinux:8" ;; + osmo-*-debian10) echo "debian:buster" ;; debian9-*) echo "debian:stretch" ;; debian10-*) echo "debian:buster" ;; debian11-*) echo "debian:bullseye" ;; @@ -79,6 +83,10 @@ # e.g. osmo-mgw-latest-centos8 -> osmo-mgw-latest echo "$1" | sed 's/\-centos8$//' ;; + osmo-*-debian10) + # e.g. osmo-gbproxy-master-debian10 -> osmo-gbproxy-master + echo "$1" | sed 's/\-debian10$//' + ;; centos8-obs-20*q*) # e.g. centos8-obs-2021q1 -> centos8-obs-latest echo "$1" | sed 's/20[0-9][0-9]q.*$/latest/' -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40021?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1a41ca8ddd06f716c4bf29d60a0c2f0f82dc4e35 Gerrit-Change-Number: 40021 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months

1
0
0 0

[L] Change in docker-playground[master]: Remove ttcn3 testsuites ported to testenv, part 3

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40022?usp=email ) Change subject: Remove ttcn3 testsuites ported to testenv, part 3 ...................................................................... Remove ttcn3 testsuites ported to testenv, part 3 Related: OS#6494 Change-Id: Ic07793fb7d8889684fd89b00860ebd0b17561a9e --- D ttcn3-msc-test/Dockerfile D ttcn3-msc-test/MSC_Tests.cfg D ttcn3-msc-test/Makefile D ttcn3-msc-test/jenkins.sh D ttcn3-msc-test/osmo-msc.cfg D ttcn3-msc-test/osmo-stp.cfg D ttcn3-sccp-test/Dockerfile D ttcn3-sccp-test/Makefile D ttcn3-sccp-test/SCCP_Tests.cfg D ttcn3-sccp-test/jenkins.sh D ttcn3-sccp-test/sccp_demo_user.cfg 11 files changed, 0 insertions(+), 405 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile deleted file mode 100644 index 6fe48d4..0000000 --- a/ttcn3-msc-test/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REGISTRY -ARG USER -FROM $REGISTRY/$USER/debian-bookworm-titan -ARG OSMO_TTCN3_BRANCH="master" - -ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit -RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc - -VOLUME /data - -COPY MSC_Tests.cfg /data/MSC_Tests.cfg - -CMD ttcn3-docker-run msc MSC_Tests diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg deleted file mode 100644 index 66ad4d1..0000000 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ /dev/null @@ -1,60 +0,0 @@ -[ORDERED_INCLUDE] -"/osmo-ttcn3-hacks/Common.cfg" -"/osmo-ttcn3-hacks/msc/MSC_Tests.default" - -[LOGGING] - -[TESTPORT_PARAMETERS] -*.MSCVTY.CTRL_HOSTNAME := "172.18.20.10" - -[MODULE_PARAMETERS] -# connection to STP -MSC_Tests.mp_bssap_cfg := { - { - transport := BSSAP_TRANSPORT_AoIP, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23906, "172.18.20.103", 2905, "172.18.20.200" }, - own_pc := 193, /* 0.24.1 BSC emulation [0] */ - own_ssn := 254, - peer_pc := 185, /* 0.23.1 osmo-msc */ - peer_ssn := 254, - sio := '83'O, - rctx := 0 - }, - { - transport := BSSAP_TRANSPORT_AoIP, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23907, "172.18.20.103", 2905, "172.18.20.200" }, - own_pc := 194, /* 0.24.2 BSC emulation [1] */ - own_ssn := 254, - peer_pc := 185, /* 0.23.1 osmo-msc */ - peer_ssn := 254, - sio := '83'O, - rctx := 1 - }, - { - transport := RANAP_TRANSPORT_IuCS, - sccp_service_type := "mtp3_itu", - sctp_addr := { 23908, "172.18.20.103", 2905, "172.18.20.200" }, - own_pc := 195, /* 0.24.3 BSC emulation [2] */ - own_ssn := 142, - peer_pc := 185, /* 0.23.1 osmo-msc */ - peer_ssn := 142, - sio := '83'O, - rctx := 2 - } -}; - -# remote (IUT) side -MSC_Tests.mp_msc_mncc := "/data/unix/mncc"; -MSC_Tests.mp_msc_ip := "172.18.20.10"; -# local (emulation) side) -MSC_Tests.mp_hlr_ip := "172.18.20.103"; -MSC_Tests.mp_mgw_ip := "172.18.20.103"; - -[MAIN_CONTROLLER] - -[EXECUTE] -MSC_Tests.control -MSC_Tests_Iu.control -MSC_Tests_ASCI.control diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile deleted file mode 100644 index 6eb2c78..0000000 --- a/ttcn3-msc-test/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data - -include ../make/Makefile diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh deleted file mode 100755 index 46844d5..0000000 --- a/ttcn3-msc-test/jenkins.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -. ../jenkins-common.sh -IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" -docker_images_require \ - "osmo-stp-$IMAGE_SUFFIX" \ - "osmo-msc-$IMAGE_SUFFIX" \ - "ttcn3-msc-test" - -set_clean_up_trap -set -e - -mkdir $VOL_BASE_DIR/msc-tester -mkdir $VOL_BASE_DIR/msc-tester/unix -cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -write_mp_osmo_repo "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - -mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ - -mkdir $VOL_BASE_DIR/msc -mkdir $VOL_BASE_DIR/msc/unix -cp osmo-msc.cfg $VOL_BASE_DIR/msc/ - -mkdir $VOL_BASE_DIR/unix - -network_create -network_replace_subnet_in_configs - -echo Starting container with STP -docker run --rm \ - $(docker_network_params $SUBNET 200) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/stp:/data \ - --name ${BUILD_TAG}-stp -d \ - $REPO_USER/osmo-stp-$IMAGE_SUFFIX - -echo Starting container with MSC -docker run --rm \ - $(docker_network_params $SUBNET 10) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/msc:/data \ - -v $VOL_BASE_DIR/unix:/data/unix \ - --name ${BUILD_TAG}-msc -d \ - $DOCKER_ARGS \ - $REPO_USER/osmo-msc-$IMAGE_SUFFIX \ - /bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1" - -echo Starting container with MSC testsuite -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ - -e "OSMO_SUT_PORT=4254" \ - -v $VOL_BASE_DIR/msc-tester:/data \ - -v $VOL_BASE_DIR/unix:/data/unix \ - --name ${BUILD_TAG}-ttcn3-msc-test \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-msc-test diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg deleted file mode 100644 index b7b39f9..0000000 --- a/ttcn3-msc-test/osmo-msc.cfg +++ /dev/null @@ -1,98 +0,0 @@ -! -! OsmoMSC (1.1.2.66-629c4-dirty) configuration saved from vty -!! -! -log gsmtap 172.18.20.103 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level rll notice - logging level cc debug - logging level mm debug - logging level rr notice - logging level mncc debug - logging level pag notice - logging level msc notice - logging level mgcp debug - logging level ho notice - logging level db notice - logging level ref notice - logging level ctrl notice - logging level smpp debug - logging level ranap debug - logging level vlr debug - logging level iucs debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl info - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp debug -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - point-code 0.23.1 - asp asp-clnt-OsmoMSC-A 2905 0 m3ua - local-ip 172.18.20.10 - local-ip fd02:db8:20::10 - remote-ip 172.18.20.200 - remote-ip fd02:db8:20::200 - role asp - sctp-role client - as as-clnt-OsmoMSC-A m3ua - asp asp-clnt-OsmoMSC-A - routing-key 3 0.23.1 -network - network country code 262 - mobile network code 42 - short name OsmoMSC - long name OsmoMSC - encryption a5 0 - encryption uea 0 - authentication optional - rrlp mode none - mm info 0 -msc - assign-tmsi - cs7-instance-a 0 - cs7-instance-iu 0 - mgw remote-ip 172.18.20.103 - emergency-call route-to-msisdn 112 - mncc external /data/unix/mncc -mncc-int - default-codec tch-f fr - default-codec tch-h hr -smpp - local-tcp-port 2775 - policy closed - no smpp-first - esme msc_tester - password osmocom1 -hlr - remote-ip 172.18.20.103 - remote-port 4222 - ipa-name test-MSC diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg deleted file mode 100644 index a893f4b..0000000 --- a/ttcn3-msc-test/osmo-stp.cfg +++ /dev/null @@ -1,62 +0,0 @@ -! -! OsmoSTP (0.8.1) configuration saved from vty -!! -! -log gsmtap 172.18.20.103 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level set-all debug -! -line vty - no login -! -cs7 instance 0 - xua rkm routing-key-allocation dynamic-permitted - asp virt-bsc0-0 23906 2905 m3ua - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - remote-ip 172.18.20.103 - remote-ip fd02:db8:20::103 - role sg - sctp-role server - as virt-bsc0 m3ua - asp virt-bsc0-0 - routing-key 0 0.24.1 - asp virt-bsc1-0 23907 2905 m3ua - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - remote-ip 172.18.20.103 - remote-ip fd02:db8:20::103 - role sg - sctp-role server - as virt-bsc1 m3ua - asp virt-bsc1-0 - routing-key 1 0.24.2 - asp virt-rnc0-0 23908 2905 m3ua - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - remote-ip 172.18.20.103 - remote-ip fd02:db8:20::103 - role sg - sctp-role server - as virt-rnc0 m3ua - asp virt-rnc0-0 - routing-key 2 0.24.3 - route-table system - update route 0.24.1 7.255.7 linkset virt-bsc0 - update route 0.24.2 7.255.7 linkset virt-bsc1 - update route 0.24.3 7.255.7 linkset virt-rnc0 - listen m3ua 2905 - accept-asp-connections dynamic-permitted - local-ip 172.18.20.200 - local-ip fd02:db8:20::200 - listen ipa 5000 - accept-asp-connections dynamic-permitted - local-ip 172.18.20.200 diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile deleted file mode 100644 index 8d52787..0000000 --- a/ttcn3-sccp-test/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -ARG REGISTRY -ARG USER -FROM $REGISTRY/$USER/debian-bookworm-titan -ARG OSMO_TTCN3_BRANCH="master" - -ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit -RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp - -VOLUME /data - -COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg - -CMD ttcn3-docker-run sccp SCCP_Tests diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile deleted file mode 100644 index 4848603..0000000 --- a/ttcn3-sccp-test/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -RUN_ARGS?=-it --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data - -include ../make/Makefile diff --git a/ttcn3-sccp-test/SCCP_Tests.cfg b/ttcn3-sccp-test/SCCP_Tests.cfg deleted file mode 100644 index 0d6a91b..0000000 --- a/ttcn3-sccp-test/SCCP_Tests.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[ORDERED_INCLUDE] -"/osmo-ttcn3-hacks/Common.cfg" -"/osmo-ttcn3-hacks/sccp/SCCP_Tests.default" - -[LOGGING] -*.JUnitLogger.testsuite_name := "SCCP_Tests" - -[TESTPORT_PARAMETERS] -*.SCCP_DEMO_USER_VTY.CTRL_HOSTNAME := "172.18.22.200" -*.SCCP_DEMO_USER_VTY.CTRL_PORTNUM := "2324" - -[MODULE_PARAMETERS] -SCCP_Tests.mp_sccp_cfg := { - { - sccp_service_type := "mtp3_itu", - sctp_addr := { 2905, "172.18.22.203", 2905, "172.18.22.200" }, - own_pc := 23, - own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ - peer_pc := 1, - peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */ - sio := '03'O, /* NI=Internal, SCCP */ - rctx := 0 - } -}; - -[MAIN_CONTROLLER] - -[EXECUTE] -SCCP_Tests.control -SCCP_Tests_RAW.control diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh deleted file mode 100755 index 03a630c..0000000 --- a/ttcn3-sccp-test/jenkins.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -. ../jenkins-common.sh -IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" -# Always require osmo-stp-master since is the only with sccp_demo_user installed -docker_images_require \ - "osmo-stp-master" \ - "ttcn3-sccp-test" - -set_clean_up_trap -set -e - -mkdir $VOL_BASE_DIR/sccp-tester -cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ -write_mp_osmo_repo "$VOL_BASE_DIR/sccp-tester/SCCP_Tests.cfg" - -mkdir $VOL_BASE_DIR/sccp -cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ - -network_create -network_replace_subnet_in_configs - -echo Starting container with sccp_demo_user -docker run --rm \ - $(docker_network_params $SUBNET 200) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/sccp:/data \ - --name ${BUILD_TAG}-stp -d \ - $DOCKER_ARGS \ - $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user \ - -l $SUB4_PREFIX.$SUBNET.200 \ - -r $SUB4_PREFIX.$SUBNET.203 \ - -C /data/sccp_demo_user.cfg \ - >>/data/sccp_demo_user.log 2>&1" - - -echo Starting container with SCCP testsuite -docker run --rm \ - $(docker_network_params $SUBNET 203) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/sccp-tester:/data \ - --name ${BUILD_TAG}-ttcn3-sccp-test \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-sccp-test diff --git a/ttcn3-sccp-test/sccp_demo_user.cfg b/ttcn3-sccp-test/sccp_demo_user.cfg deleted file mode 100644 index 59c0867..0000000 --- a/ttcn3-sccp-test/sccp_demo_user.cfg +++ /dev/null @@ -1,17 +0,0 @@ -log gsmtap 172.18.22.203 - logging level set-all debug - logging filter all 1 - -log stderr - logging filter all 1 - logging color 1 - logging print level 1 - logging print category 1 - logging print category-hex 0 - logging print file basename last - logging print extended-timestamp 1 - logging level set-all debug - -line vty - no login - bind 172.18.22.200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40022?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic07793fb7d8889684fd89b00860ebd0b17561a9e Gerrit-Change-Number: 40022 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months

1
0
0 0

[L] Change in docker-playground[master]: Remove ttcn3 testsuites ported to testenv, part 3

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/40022?usp=email ) Change subject: Remove ttcn3 testsuites ported to testenv, part 3 ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: > should we maybe have a README. […] The README already points at how to run them now: ``` Historically this repository had all containers for running the TTCN3 testsuites. We are porting them over to the new testenv configurations inside `osmo-ttcn3-hacks.git` and removing them afterwards from `docker-playground.git`. See [_testenv/README.md](https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/src/br… for more information, and [OS#6494](https://osmocom.org/issues/6494) for reasoning. ``` -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40022?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic07793fb7d8889684fd89b00860ebd0b17561a9e Gerrit-Change-Number: 40022 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:14:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

4 months

1
0
0 0

[S] Change in pysim[master]: ara_m: add command to lock write access to the ARA-M rules.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/39780?usp=email ) Change subject: ara_m: add command to lock write access to the ARA-M rules. ...................................................................... ara_m: add command to lock write access to the ARA-M rules. Recent versions of the ARA-M applet from Bertrand Martel can lock the write access to ARA-M rules. Let's add a command for that and some documentation. Related: SYS#7245 Change-Id: I71581a0c9f146f9a0921093d9b53b053b4a8946c --- M docs/shell.rst M pySim/ara_m.py 2 files changed, 24 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 564f162..0eb64ba 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -1,4 +1,4 @@ -pySim-shell +pySim-shell =========== pySim-shell is an interactive command line shell for all kind of interactions with SIM cards, @@ -1006,6 +1006,24 @@ intended must be manually inserted again using :ref:`aram_store_ref_ar_do` +aram_lock +~~~~~~~~~ +This command allows to lock the access to the STORE DATA command. This renders +all access rules stored within the ARA-M applet effectively read-only. The lock +can only be removed via a secure channel to the security domain and is therefore +suitable to prevent unauthorized changes to ARA-M rules. + +Removal of the lock: +:: + + pySIM-shell (SCP02[01]:00:MF/ADF.ISD)> install_for_personalization A00000015141434C00 + pySIM-shell (SCP02[01]:00:MF/ADF.ISD)> apdu --expect-sw 9000 80E2900001A2 + +NOTE: ARA-M Locking is a proprietary feature that is specific to sysmocom's +fork of Bertrand Martel's ARA-M implementation. ARA-M Locking is supported in +newer (2025) applet versions from v0.1.0 onward. + + GlobalPlatform commands ----------------------- diff --git a/pySim/ara_m.py b/pySim/ara_m.py index 7a0f93f..e10ae10 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -389,6 +389,11 @@ if res_do: self._cmd.poutput_json(res_do.to_dict()) + def do_aram_lock(self, opts): + """Lock STORE DATA command to prevent unauthorized changes + (Proprietary feature that is specific to sysmocom's fork of Bertrand Martel’s ARA-M implementation.)""" + self._cmd.lchan.scc.send_apdu_checksw('80e2900001A1', '9000') + # SEAC v1.1 Section 4.1.2.2 + 5.1.2.2 sw_aram = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71581a0c9f146f9a0921093d9b53b053b4a8946c Gerrit-Change-Number: 39780 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

4 months

1
0
0 0

[S] Change in pysim[master]: ara_m: add command to lock write access to the ARA-M rules.

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/39780?usp=email ) Change subject: ara_m: add command to lock write access to the ARA-M rules. ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71581a0c9f146f9a0921093d9b53b053b4a8946c Gerrit-Change-Number: 39780 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Apr 2025 11:14:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: stp: Fix typo in comment

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40002?usp=email ) Change subject: stp: Fix typo in comment ...................................................................... stp: Fix typo in comment Change-Id: I9f4a1e5ec0b0d2614b3cec0768e8847fce3e3cdf --- M stp/STP_Tests_IPA.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 66e7262..ae7e1da 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -309,8 +309,8 @@ } } - /* All traffic should not still be sent to the same receiver, since - * OPC+SLS cannot change in IPA ASPs. + /* All traffic should still be sent to the same receiver, since + * OPC+DPC+SLS cannot change in IPA ASPs. * However, depending on how the SLS seed tables were allocated, it can * be that STP was routing through Alternative Route and now that the * 2nd receiver is up it is now routing to it (Normal Route). Account -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9f4a1e5ec0b0d2614b3cec0768e8847fce3e3cdf Gerrit-Change-Number: 40002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites: run FR tests with debian 10

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40023?usp=email ) Change subject: jobs/ttcn3-testsuites: run FR tests with debian 10 ...................................................................... jobs/ttcn3-testsuites: run FR tests with debian 10 It is required that we run the FR tests with debian 10. Related: OS#6494#note-19 Depends: docker-playground I1a41ca8ddd06f716c4bf29d60a0c2f0f82dc4e35 Change-Id: Ibd4cb705048ef5c39fa4192870e2b0f0d067842f --- M jobs/ttcn3-testsuites.yml 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 6261af9..0ac11b6 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -123,6 +123,17 @@ DIR="$(echo "{job-name}" | sed s/^TTCN3-centos7\-/ttcn3-/)" export IMAGE_SUFFIX="master-centos7" ;; + ttcn3-*-test-fr|ttcn3-fr-test) + # FR tests must run in debian 10 (OS#6494#note-19) + DIR="{job-name}" + export IMAGE_SUFFIX="master-debian10" + ;; + ttcn3-gbproxy-test-fr-latest) + # FR tests must run in debian 10 (OS#6494#note-19) + DIR="$(echo "{job-name}" | sed s/\-latest$//)" + export IMAGE_SUFFIX="latest-debian10" + ;; + *-asan) DIR="$(echo "{job-name}" | sed s/\-asan$//)" export IMAGE_SUFFIX="asan" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40023?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibd4cb705048ef5c39fa4192870e2b0f0d067842f Gerrit-Change-Number: 40023 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025