- gerrit-log - lists.osmocom.org

[S] Change in osmo-e1d[master]: e1_ts_stop: clear tx_started flag
by falconia 03 Jul '24

03 Jul '24

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/37319?usp=email ) Change subject: e1_ts_stop: clear tx_started flag ...................................................................... e1_ts_stop: clear tx_started flag ts->raw.tx_started flag gets set in the channelized mux process when bytes begin arriving from the raw TS client application. However, there is no reset of this flag anywhere, hence if a user opens some TS, then kills that client application, then opens it again (with the same or different client app), there is a flood of error messages about TS read underflow. Solution: clear the tx_started flag when the TS is stopped. Change-Id: I28ff68208f1d3d20dc57c5306fec74bd2f884cb1 --- M src/ctl.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve tnt: Looks good to me, approved diff --git a/src/ctl.c b/src/ctl.c index e63589b..a9818b3 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -119,6 +119,7 @@ ts->raw.rx_buf = NULL; ts->raw.rx_buf_size = 0; ts->raw.rx_buf_used = 0; + ts->raw.tx_started = false; } static void -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/37319?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I28ff68208f1d3d20dc57c5306fec74bd2f884cb1 Gerrit-Change-Number: 37319 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

[S] Change in osmo-e1d[master]: configure.ac: lower libusb-1.0 requirement to 1.0.20
by falconia 03 Jul '24

03 Jul '24

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/37318?usp=email ) Change subject: configure.ac: lower libusb-1.0 requirement to 1.0.20 ...................................................................... configure.ac: lower libusb-1.0 requirement to 1.0.20 Current configure.ac requires libusb version to be >= 1.0.21. Slackware 14.2 has libusb version 1.0.20. Lowering the requirement in configure.ac produces a successful build, i.e., the actual code does not use any libusb APIs that are new with version 1.0.21. Change-Id: I15586757e2985184359a4488c79f2c587affeb56 --- M configure.ac 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 8bec040..cea8eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.9.0) -PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21) +PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.20) AC_CONFIG_MACRO_DIR([m4]) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/37318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I15586757e2985184359a4488c79f2c587affeb56 Gerrit-Change-Number: 37318 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

[M] Change in docker-playground[master]: jenkins-common.sh: Store IP subnet prefix in global variable
by pespin 03 Jul '24

03 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37331?usp=email ) Change subject: jenkins-common.sh: Store IP subnet prefix in global variable ...................................................................... jenkins-common.sh: Store IP subnet prefix in global variable Change-Id: Icc492aea1ddb91f672c7a0cec764b42711789fb6 --- M jenkins-common.sh M osmo-ran/jenkins.sh M ttcn3-asterisk-ims-ue-test/jenkins.sh M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-hnodeb-test/jenkins.sh M ttcn3-hss-test-ogs/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh M ttcn3-upf-test/jenkins.sh 24 files changed, 54 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/37331/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 8ec6b29..af52b7f 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -2,6 +2,9 @@ KERNEL_TEST_DIR="$(realpath ../scripts/kernel-test)" DEBIAN_DEFAULT="bookworm" +SUB4_PREFIX="172.18" +SUB6_PREFIX="fd02:db8" + docker_image_exists() { test -n "$(docker images -q "$REPO_USER/$1")" } @@ -251,8 +254,8 @@ for i in $(seq 1 30); do SUBNET="$(echo "($SUBNET + 1) % 256" | bc)" NET_NAME="$SUITE_NAME-$SUBNET" - SUB4="172.18.$SUBNET.0/24" - SUB6="fd02:db8:$SUBNET::/64" + SUB4="$SUB4_PREFIX.$SUBNET.0/24" + SUB6="$SUB6_PREFIX:$SUBNET::/64" set +x echo "Creating network $NET_NAME, trying SUBNET=$SUBNET..." set -x @@ -291,8 +294,8 @@ network_clean network_remove fi - SUB4="172.18.$NET.0/24" - SUB6="fd02:db8:$NET::/64" + SUB4="$SUB4_PREFIX.$NET.0/24" + SUB6="$SUB6_PREFIX:$NET::/64" set +x echo "Creating network $NET_NAME" set -x @@ -300,7 +303,7 @@ --driver=bridge \ --subnet $SUB4 \ --ipv6 --subnet $SUB6 \ - -o "com.docker.network.bridge.host_binding_ipv4"="172.18.$NET.1" \ + -o "com.docker.network.bridge.host_binding_ipv4"="$SUB4_PREFIX.$NET.1" \ $NET_NAME } @@ -369,8 +372,8 @@ sed \ -i \ -E \ - -e "s/172\.18\.[0-9]{1,3}\./172.18.$SUBNET./g" \ - -e "s/fd02:db8:[0-9]{1,3}:/fd02:db8:$SUBNET:/g" \ + -e "s/172\.18\.[0-9]{1,3}\./$SUB4_PREFIX.$SUBNET./g" \ + -e "s/$SUB6_PREFIX:[0-9]{1,3}:/$SUB6_PREFIX:$SUBNET:/g" \ "$i" done @@ -383,7 +386,7 @@ docker_network_params() { NET=$1 ADDR_SUFIX=$2 - echo --network $NET_NAME --ip "172.18.$NET.$ADDR_SUFIX" --ip6 "fd02:db8:$NET::$ADDR_SUFIX" + echo --network $NET_NAME --ip "$SUB4_PREFIX.$NET.$ADDR_SUFIX" --ip6 "$SUB6_PREFIX:$NET::$ADDR_SUFIX" } fix_perms() { diff --git a/osmo-ran/jenkins.sh b/osmo-ran/jenkins.sh index 1b5d93a..120d2a0 100755 --- a/osmo-ran/jenkins.sh +++ b/osmo-ran/jenkins.sh @@ -9,6 +9,7 @@ "systemd" \ "osmo-ran$IMAGE_SUFFIX" +SUB4_PREFIX=${SUB4_PREFIX:-"172.18"} SUBNET=${SUBNET:-25} IPSUFFIX=200 NET_NAME="osmo-ran-subnet$SUBNET" @@ -20,7 +21,7 @@ mkdir $VOL_RAN_DIR/osmocom cp osmocom/* $VOL_RAN_DIR/osmocom/ -DOCKER_IN_IP="172.18.$SUBNET.$IPSUFFIX" +DOCKER_IN_IP="$SUB4_PREFIX.$SUBNET.$IPSUFFIX" SGSN_IP="${SGSN_IP:-192.168.30.1}" STP_IP="${STP_IP:-192.168.30.1}" TRX_IP="${TRX_IP:-192.168.30.100}" diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index eba4bd8..2e10f76 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -24,7 +24,7 @@ network_create network_replace_subnet_in_configs -SUBNET_IP_PREFIX="172.18.$SUBNET" +SUBNET_IP_PREFIX="$SUB4_PREFIX.$SUBNET" ASTERISK_IP_SUFFIX="10" TTCN3_IP_SUFFIX="103" IMSCORE_IP_SUFFIX="104" diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 219d813..e9a130d 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -59,7 +59,7 @@ /bin/sh -c "/usr/local/bin/respawn.sh \ osmo-bts-omldummy \ $BTS_FEATURES \ - 172.18.$SUBNET.20 \ + $SUB4_PREFIX.$SUBNET.20 \ $((i + 1234)) \ 1 \ >>/data/osmo-bts-omldummy-${i}.log 2>&1" @@ -70,7 +70,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 0a3128c..f0274ad 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -59,7 +59,7 @@ /bin/sh -c "/usr/local/bin/respawn.sh \ osmo-bts-omldummy \ $BTS_FEATURES \ - 172.18.$SUBNET.20 \ + $SUB4_PREFIX.$SUBNET.20 \ $(($1 + 1234)) \ $2 \ >>/data/osmo-bts-omldummy-$1.log 2>&1" @@ -74,7 +74,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 35415cd..40c00ac 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -72,11 +72,11 @@ --log-file-level DEBUG \ --log-file-time \ --log-level INFO \ - -R 172.18.$SUBNET.20 \ - -r 172.18.$SUBNET.22 \ - --trx TRX1@172.18.$SUBNET.20:5700/1 \ - --trx TRX2@172.18.$SUBNET.20:5700/2 \ - --trx TRX3@172.18.$SUBNET.20:5700/3 \ + -R $SUB4_PREFIX.$SUBNET.20 \ + -r $SUB4_PREFIX.$SUBNET.22 \ + --trx TRX1@$SUB4_PREFIX.$SUBNET.20:5700/1 \ + --trx TRX2@$SUB4_PREFIX.$SUBNET.20:5700/2 \ + --trx TRX3@$SUB4_PREFIX.$SUBNET.20:5700/3 \ >>/data/fake_trx.out 2>&1" } @@ -91,7 +91,7 @@ $DOCKER_ARGS \ $REPO_USER/osmocom-bb-host-master \ /bin/sh -c "trxcon \ - -i 172.18.$SUBNET.21 \ + -i $SUB4_PREFIX.$SUBNET.21 \ -s /data/unix/osmocom_l2 \ >>/data/trxcon.log 2>&1" } @@ -116,7 +116,7 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4241" \ -v $VOL_BASE_DIR/bts-tester-${variant}:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 6026df0..584d0b7 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -33,7 +33,7 @@ $(docker_network_params $SUBNET 100) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4264" \ -v $VOL_BASE_DIR/cbc-tester:/data \ --name ${BUILD_TAG}-ttcn3-cbc-test \ diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 72dc4af..9d90129 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -61,7 +61,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4246" \ -e "WAIT_FOR_NETDEV=hdlc8" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 861be39..c07f389 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -39,7 +39,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4246" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ --name ${BUILD_TAG}-ttcn3-gbproxy-test \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 7c9c7ac..c150ecc 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -61,13 +61,13 @@ -v "$KERNEL_TEST_DIR:/kernel-test:ro" -v "$CACHE_DIR:/cache" " - OSMO_SUT_HOST="172.18.$SUBNET.200" + OSMO_SUT_HOST="$SUB4_PREFIX.$SUBNET.200" else GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) " - OSMO_SUT_HOST="172.18.$SUBNET.201" + OSMO_SUT_HOST="$SUB4_PREFIX.$SUBNET.201" fi docker run --rm \ --cap-add=NET_ADMIN \ diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 66d102e..c716add 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -34,7 +34,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4258" \ -v $VOL_BASE_DIR/hlr-tester:/data \ --name ${BUILD_TAG}-ttcn3-hlr-test \ diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index 21647ed..d886378 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -67,7 +67,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4261" \ -v $base_dir/hnbgw-tester:/data \ -v $base_dir/unix:/data/unix \ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index cdc47b0..d3ae816 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -38,7 +38,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4273" \ -v $VOL_BASE_DIR/hnodeb-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh index eb60835..d8932aa 100755 --- a/ttcn3-hss-test-ogs/jenkins.sh +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -24,7 +24,7 @@ network_create network_replace_subnet_in_configs -MONGOD_ADDR="172.18.$SUBNET.103" +MONGOD_ADDR="$SUB4_PREFIX.$SUBNET.103" DBCTL="open5gs-dbctl --db_uri=mongodb://$MONGOD_ADDR/open5gs" # start container with mongod in background diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 5395fa3..4add209 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -34,7 +34,7 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/mgw-tester:/data \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.180" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.180" \ -e "OSMO_SUT_PORT=4243" \ --name ${BUILD_TAG}-ttcn3-mgw-test \ $DOCKER_ARGS \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 6a0f3d5..46844d5 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -51,7 +51,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -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 \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index dcd0ce9..6147a73 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -46,7 +46,7 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.101" \ -e "OSMO_SUT_PORT=4240" \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 158a352..281b00d 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -32,7 +32,7 @@ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \ /bin/sh -c "pcscd; \ osmo-remsim-bankd \ - -i 172.18.$SUBNET.10 \ + -i $SUB4_PREFIX.$SUBNET.10 \ >/data/osmo-remsim-bankd.log 2>&1" } diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 7eadd5d..03a630c 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -29,8 +29,8 @@ $DOCKER_ARGS \ $REPO_USER/osmo-stp-master \ /bin/sh -c "sccp_demo_user \ - -l 172.18.$SUBNET.200 \ - -r 172.18.$SUBNET.203 \ + -l $SUB4_PREFIX.$SUBNET.200 \ + -r $SUB4_PREFIX.$SUBNET.203 \ -C /data/sccp_demo_user.cfg \ >>/data/sccp_demo_user.log 2>&1" diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9238096..e1f40f6 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -49,7 +49,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4245" \ -v $VOL_BASE_DIR/sgsn-tester:/data \ --name ${BUILD_TAG}-ttcn3-sgsn-test \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 5ccbdf5..6558875 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -39,7 +39,7 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.10" \ -e "OSMO_SUT_PORT=4256" \ -v $VOL_BASE_DIR/sip-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index ab284b3..5bcdcbe 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -47,7 +47,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4271" \ -v $VOL_BASE_DIR/smlc-tester:/data \ --name ${BUILD_TAG}-ttcn3-smlc-test \ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index b1f02b9..9975f5e 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -40,7 +40,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.200" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.200" \ -e "OSMO_SUT_PORT=4239" \ -v $VOL_BASE_DIR/stp-tester:/data \ --name ${BUILD_TAG}-ttcn3-stp-test \ diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh index 8bb19e2..47b892c 100755 --- a/ttcn3-upf-test/jenkins.sh +++ b/ttcn3-upf-test/jenkins.sh @@ -33,7 +33,7 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_HOST=$SUB4_PREFIX.$SUBNET.20" \ -e "OSMO_SUT_PORT=4275" \ -v $VOL_BASE_DIR/upf-tester:/data \ --name ${BUILD_TAG}-ttcn3-upf-test \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37331?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icc492aea1ddb91f672c7a0cec764b42711789fb6 Gerrit-Change-Number: 37331 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir
by pespin 03 Jul '24

03 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37330?usp=email ) Change subject: ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir ...................................................................... ttcn3-asterisk: Move ttcn3 docker related files to ttcn3/ subdir Other files belonging to other containers are already placed in subdirs, so do the same for these ones too. Change-Id: Ie2b3de22df9ab155f42a717bccf718fccd388fc6 --- M ttcn3-asterisk-ims-ue-test/Dockerfile M ttcn3-asterisk-ims-ue-test/jenkins.sh R ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg R ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh 4 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/30/37330/1 diff --git a/ttcn3-asterisk-ims-ue-test/Dockerfile b/ttcn3-asterisk-ims-ue-test/Dockerfile index 1a2f8aa..3f37803 100644 --- a/ttcn3-asterisk-ims-ue-test/Dockerfile +++ b/ttcn3-asterisk-ims-ue-test/Dockerfile @@ -8,6 +8,7 @@ VOLUME /data -COPY Asterisk_Tests.cfg /data/Asterisk_Tests.cfg +COPY ttcn3/Asterisk_Tests.cfg /data/Asterisk_Tests.cfg +COPY ttcn3/ttcn3.sh /data/ttcn3.sh CMD ttcn3-docker-run asterisk Asterisk_Tests diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index a5da1d0..eba4bd8 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -15,8 +15,8 @@ mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester/unix -cp ttcn3.sh $VOL_BASE_DIR/asterisk-ims-ue-tester/ -cp Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/ +cp ttcn3/ttcn3.sh $VOL_BASE_DIR/asterisk-ims-ue-tester/ +cp ttcn3/Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/asterisk-ims-ue-tester/Asterisk_Tests.cfg" mkdir $VOL_BASE_DIR/asterisk diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg similarity index 100% rename from ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg rename to ttcn3-asterisk-ims-ue-test/ttcn3/Asterisk_Tests.cfg diff --git a/ttcn3-asterisk-ims-ue-test/ttcn3.sh b/ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh similarity index 100% rename from ttcn3-asterisk-ims-ue-test/ttcn3.sh rename to ttcn3-asterisk-ims-ue-test/ttcn3/ttcn3.sh -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie2b3de22df9ab155f42a717bccf718fccd388fc6 Gerrit-Change-Number: 37330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test/jenkins: tweak loop logic
by osmith 03 Jul '24

03 Jul '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37329?usp=email ) Change subject: ttcn3-ggsn-test/jenkins: tweak loop logic ...................................................................... ttcn3-ggsn-test/jenkins: tweak loop logic Iterate over TEST_CONFIGS instead of TEST_CONFIGS_ALL and then filtering with test_config_enabled. Change-Id: Ie7701abe6ab7cff139766eca9240e0f26af32231 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 13 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 7c9c7ac..bd0fae1 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -109,11 +109,7 @@ CONFIGS_DIR="osmo-ggsn" fi -for i in $TEST_CONFIGS_ALL; do - if ! test_config_enabled "$i"; then - continue - fi - +for i in $TEST_CONFIGS; do # OS#6106: Currently it is not possible to configure multiple APNs with # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U # bind socket between tunnels. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie7701abe6ab7cff139766eca9240e0f26af32231 Gerrit-Change-Number: 37329 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test/jenkins: tweak loop logic
by pespin 03 Jul '24

03 Jul '24

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37329?usp=email ) Change subject: ttcn3-ggsn-test/jenkins: tweak loop logic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie7701abe6ab7cff139766eca9240e0f26af32231 Gerrit-Change-Number: 37329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Jul 2024 12:07:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test/jenkins: tweak loop logic
by osmith 03 Jul '24

03 Jul '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37329?usp=email ) Change subject: ttcn3-ggsn-test/jenkins: tweak loop logic ...................................................................... ttcn3-ggsn-test/jenkins: tweak loop logic Iterate over TEST_CONFIGS instead of TEST_CONFIGS_ALL and then filtering with test_config_enabled. Change-Id: Ie7701abe6ab7cff139766eca9240e0f26af32231 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/29/37329/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 7c9c7ac..bd0fae1 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -109,11 +109,7 @@ CONFIGS_DIR="osmo-ggsn" fi -for i in $TEST_CONFIGS_ALL; do - if ! test_config_enabled "$i"; then - continue - fi - +for i in $TEST_CONFIGS; do # OS#6106: Currently it is not possible to configure multiple APNs with # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U # bind socket between tunnels. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie7701abe6ab7cff139766eca9240e0f26af32231 Gerrit-Change-Number: 37329 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hlr[master]: mslookup: don't ignore return value of write()
by osmith 03 Jul '24

03 Jul '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37328?usp=email ) Change subject: mslookup: don't ignore return value of write() ...................................................................... mslookup: don't ignore return value of write() Fix GCC 13.2.0 refuses to build this with -Werror: src/mslookup/osmo-mslookup-client.c: In function 'socket_client_respond_result': src/osmo-hlr/src/mslookup/osmo-mslookup-client.c:432:9: error: ignoring return value of 'write' declared with attribute 'warn_unused_result' [-Werror=unused-result] 432 | write(c->ofd.fd, response, strlen(response)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/mslookup/osmo-mslookup-client.c: In function 'socket_accept': src/osmo-hlr/src/mslookup/osmo-mslookup-client.c:530:17: error: ignoring return value of 'write' declared with attribute 'warn_unused_result' [-Werror=unused-result] 530 | write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I4b2e5cabe5306a999197f7c98362d872a3739078 --- M src/mslookup/osmo-mslookup-client.c 1 file changed, 32 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/mslookup/osmo-mslookup-client.c b/src/mslookup/osmo-mslookup-client.c index 37f1256..0a29645 100644 --- a/src/mslookup/osmo-mslookup-client.c +++ b/src/mslookup/osmo-mslookup-client.c @@ -429,7 +429,11 @@ void socket_client_respond_result(struct socket_client *c, const char *response) { - write(c->ofd.fd, response, strlen(response)); + size_t len = strlen(response); + int rc = write(c->ofd.fd, response, len); + + if (rc != len) + print_error("%s: write() returned %d instead of %zu\n", __func__, rc, len); } static int socket_read_cb(struct osmo_fd *ofd) @@ -526,8 +530,13 @@ llist_add(&c->entry, &globals.socket_clients); - if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) - write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); + if (globals.format == FORMAT_CSV && cmdline_opts.csv_headers) { + size_t len = strlen(CSV_HEADERS); + int rc = write(c->ofd.fd, CSV_HEADERS, strlen(CSV_HEADERS)); + + if (rc != len) + print_error("%s: write() returned %d instead of %zu\n", __func__, rc, len); + } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I4b2e5cabe5306a999197f7c98362d872a3739078 Gerrit-Change-Number: 37328 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-hlr[master]: mslookup: don't ignore return value of write()
by osmith 03 Jul '24

03 Jul '24

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37328?usp=email ) Change subject: mslookup: don't ignore return value of write() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I4b2e5cabe5306a999197f7c98362d872a3739078 Gerrit-Change-Number: 37328 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Jul 2024 11:54:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: publish-tarballs-for-tags.sh: publish osmo-epdg's versions
by osmith 03 Jul '24

03 Jul '24

Attention is currently required from: laforge, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37324?usp=email ) Change subject: publish-tarballs-for-tags.sh: publish osmo-epdg's versions ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37324?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3445e76f6fd6ebb49ada5dc4320c6b9fa717f00c Gerrit-Change-Number: 37324 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 03 Jul 2024 11:53:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log