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

[S] Change in osmo-ci[master]: scripts/manuals/publish-manuals-for-tags: use bookworm

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34052 ) Change subject: scripts/manuals/publish-manuals-for-tags: use bookworm ...................................................................... scripts/manuals/publish-manuals-for-tags: use bookworm Related: OS#6057 Change-Id: Ifa56e7f035fde5fb750376c64572277de2417d65 --- M scripts/manuals/publish-manuals-for-tags.sh 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 49a3d43..3f95ce7 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -4,7 +4,7 @@ TEMP="$OSMO_CI_DIR/_temp_manuals" WEB_PATH="/downloads/home/docs/web-files" SSH_COMMAND="ssh -o UserKnownHostsFile=$TEMP/src/osmo-gsm-manuals/build/known_hosts -p 48" -DOCKER_IMAGE="$USER/debian-bullseye-jenkins" +DOCKER_IMAGE="$USER/debian-bookworm-build" LOG_PREFIX="::" # Releases that were made before shared osmo-gsm-manuals, or where build fails -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifa56e7f035fde5fb750376c64572277de2417d65 Gerrit-Change-Number: 34052 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

2 years

1
0
0 0

[S] Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: use bookworm

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34050 ) Change subject: jobs/registry-rebuild-upload-titan: use bookworm ...................................................................... jobs/registry-rebuild-upload-titan: use bookworm Related: OS#6057 Depends: docker-playground I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 Change-Id: Ibc25a62c2d3a2f6cd3e8136311ce2b37688c71a7 --- M jobs/registry-rebuild-upload-titan.yml 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/registry-rebuild-upload-titan.yml b/jobs/registry-rebuild-upload-titan.yml index 84f8076..a535920 100644 --- a/jobs/registry-rebuild-upload-titan.yml +++ b/jobs/registry-rebuild-upload-titan.yml @@ -17,7 +17,7 @@ - job: name: registry-rebuild-upload-titan description: | - Rebuild + push ttcn3 base images (debian-bullseye-titan) in our private + Rebuild + push ttcn3 base images (debian-bookworm-titan) in our private registry.osmocom.org <br><br> Related:<br> @@ -34,8 +34,8 @@ builders: - shell: | REGISTRY="registry.osmocom.org" - make -C debian-bullseye-titan REGISTRY_HOST=$REGISTRY - docker push "$REGISTRY/$USER/debian-bullseye-titan" + make -C debian-bookworm-titan REGISTRY_HOST=$REGISTRY + docker push "$REGISTRY/$USER/debian-bookworm-titan" publishers: - email: notify-every-unstable-build: true -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibc25a62c2d3a2f6cd3e8136311ce2b37688c71a7 Gerrit-Change-Number: 34050 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmo-ci[master]: scripts/osmo-ci-docker-rebuild: drop debian-bullseye-jenkins

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34053 ) Change subject: scripts/osmo-ci-docker-rebuild: drop debian-bullseye-jenkins ...................................................................... scripts/osmo-ci-docker-rebuild: drop debian-bullseye-jenkins It is not used anymore, stop building it. Related: OS#6057 Change-Id: I8e11e4c87fea9a2cfc5e72f0427cf4ca82030554 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 08b7cf1..c9e2b63 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,11 +5,9 @@ case "$(arch)" in x86_64) - # debian-bullseye-jenkins: has python2 (OS#5950) docker_images_require \ "debian-bookworm-build" \ - "debian-bookworm-erlang" \ - "debian-bullseye-jenkins" + "debian-bookworm-erlang" ;; arm*) docker_images_require \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e11e4c87fea9a2cfc5e72f0427cf4ca82030554 Gerrit-Change-Number: 34053 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

2 years

1
0
0 0

[S] Change in osmo-ci[master]: jobs/registry-update-base-images: add bookworm

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34054 ) Change subject: jobs/registry-update-base-images: add bookworm ...................................................................... jobs/registry-update-base-images: add bookworm Related: OS#6057 Change-Id: I55ff43f1764dd5f7de46360264e0afbb4659910f --- M jobs/registry-update-base-images.yml 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index 3dec830..6c4074e 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -23,6 +23,7 @@ IMAGES=" debian:buster debian:bullseye + debian:bookworm debian:sid centos:centos7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I55ff43f1764dd5f7de46360264e0afbb4659910f Gerrit-Change-Number: 34054 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

2 years

1
0
0 0

[M] Change in docker-playground[master]: ttcn3: use debian-bookworm-titan

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34049 ) Change subject: ttcn3: use debian-bookworm-titan ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > unresolved comment, so I can merge this myself (I've tested it, but there might still be some fallou […] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2017dd3888670c475b96e692d911a433484f3df9 Gerrit-Change-Number: 34049 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Aug 2023 09:28:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in docker-playground[master]: ttcn3: use debian-bookworm-titan

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34049 ) Change subject: ttcn3: use debian-bookworm-titan ...................................................................... ttcn3: use debian-bookworm-titan Related: OS#6057 Change-Id: I2017dd3888670c475b96e692d911a433484f3df9 --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M ttcn3-bsc-test-vamos/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-cbc-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-hnbgw-test/Dockerfile M ttcn3-hnodeb-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-mme-test-ogs/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-ns-test/Dockerfile M ttcn3-pcap-client-test/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-pgw-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile M ttcn3-upf-test/Dockerfile 29 files changed, 40 insertions(+), 30 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index f91c615..f069ffc 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -23,7 +23,7 @@ osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; - ttcn3-*) echo "debian-bullseye-titan" ;; + ttcn3-*) echo "debian-bookworm-titan" ;; esac } @@ -147,7 +147,7 @@ # they are up-to-date. if [ "$REGISTRY_HOST" = "registry.osmocom.org" ]; then case "$i" in - debian-bullseye-titan) + debian-bookworm-titan) docker pull "$REGISTRY_HOST/$USER/$i" continue ;; diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 1b71671..3db8745 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -6,7 +6,7 @@ "debian-buster-build" \ "sigtran-tests" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-bullseye-titan" \ + "debian-bookworm-titan" \ "nplab-m3ua-test" set_clean_up_trap diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index 6ee52ee..a9fbadf 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -5,7 +5,7 @@ docker_images_require \ "debian-buster-build" \ "osmo-stp-$IMAGE_SUFFIX" \ - "debian-bullseye-titan" \ + "debian-bookworm-titan" \ "sigtran-tests" \ "nplab-sua-test" diff --git a/ttcn3-bsc-test-vamos/Dockerfile b/ttcn3-bsc-test-vamos/Dockerfile index eac8f46..963c8de 100644 --- a/ttcn3-bsc-test-vamos/Dockerfile +++ b/ttcn3-bsc-test-vamos/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index eac8f46..963c8de 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 07377c8..6748975 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 386ac3b..e99a7c6 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile index 4048f20..784eb25 100644 --- a/ttcn3-cbc-test/Dockerfile +++ b/ttcn3-cbc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index f237e8b..961eeef 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index c215d62..1026180 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 36778c9..447ddeb 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index e8b80a8..df3396d 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-hnbgw-test/Dockerfile b/ttcn3-hnbgw-test/Dockerfile index c37e1bf..3b4e930 100644 --- a/ttcn3-hnbgw-test/Dockerfile +++ b/ttcn3-hnbgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-hnodeb-test/Dockerfile b/ttcn3-hnodeb-test/Dockerfile index 6783abd..df6cb94 100644 --- a/ttcn3-hnodeb-test/Dockerfile +++ b/ttcn3-hnodeb-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index bfc0b9e..e8aad68 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-mme-test-ogs/Dockerfile b/ttcn3-mme-test-ogs/Dockerfile index 048a8e8..0f9d688 100644 --- a/ttcn3-mme-test-ogs/Dockerfile +++ b/ttcn3-mme-test-ogs/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +FROM $REGISTRY/$USER/debian-bookworm-titan RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 9bcd891..6fe48d4 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 12ebee4..1c31513 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-ns-test/Dockerfile b/ttcn3-ns-test/Dockerfile index d39f493..aa10337 100644 --- a/ttcn3-ns-test/Dockerfile +++ b/ttcn3-ns-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile index 10c829b..7cfd940 100644 --- a/ttcn3-pcap-client-test/Dockerfile +++ b/ttcn3-pcap-client-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index e97ac40..9ed8690 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-pgw-test/Dockerfile b/ttcn3-pgw-test/Dockerfile index 5233c5e..5e53902 100644 --- a/ttcn3-pgw-test/Dockerfile +++ b/ttcn3-pgw-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b902e2d..650c07c 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 68fd2c0..8d52787 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index da67044..eba4ddd 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 53d70db..7418ea6 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index f5dd890..6c41c1c 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 256132d..995ef53 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 diff --git a/ttcn3-upf-test/Dockerfile b/ttcn3-upf-test/Dockerfile index c0e3d6c..665d818 100644 --- a/ttcn3-upf-test/Dockerfile +++ b/ttcn3-upf-test/Dockerfile @@ -1,6 +1,6 @@ ARG REGISTRY ARG USER -FROM $REGISTRY/$USER/debian-bullseye-titan +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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2017dd3888670c475b96e692d911a433484f3df9 Gerrit-Change-Number: 34049 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in docker-playground[master]: debian-bookworm-titan{,-master}: new containers

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34048 ) Change subject: debian-bookworm-titan{,-master}: new containers ...................................................................... debian-bookworm-titan{,-master}: new containers Add new containers based on debian-bookworm. Make some improvements over the bullseye containers while at it: * Remove sed for cversion.h, as the #error it is trying to replace is a warning now so it is a no-op, and we use our own eclipse-titan package instead of debian's package. * Make apt commands consistent * Move commands around to make better use of the cache * Clone osmo-python-tests from gerrit instead of gitea and invalidate cache when master changes * Tweak comments Related: OS#6057 Change-Id: I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 --- A debian-bookworm-titan-master/Dockerfile A debian-bookworm-titan-master/Makefile A debian-bookworm-titan/Dockerfile A debian-bookworm-titan/Makefile 4 files changed, 224 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile new file mode 100644 index 0000000..2b0644a --- /dev/null +++ b/debian-bookworm-titan-master/Dockerfile @@ -0,0 +1,122 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" + +# Copy from common dir +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc +COPY .common/pipework /usr/local/bin/pipework +COPY .common/ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare +COPY .common/ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run + +# Install packages from Debian repositories (alphabetic order) +ENV DEBIAN_FRONTEND=noninteractive +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + ca-certificates \ + git \ + iputils-ping \ + netcat-openbsd \ + procps \ + python3-setuptools \ + tcpdump \ + vim \ + wget \ + wireshark-common \ + && \ + apt-get clean + +# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER +RUN set -x && \ + export DPKG_ARCH="$(dpkg --print-architecture)" && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.5_${DPKG_… && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.5_${DP… && \ + dpkg -i ./libfftranscode0_0.5_${DPKG_ARCH}.deb ./libfftranscode-dev_0.5_${DPKG_ARCH}.deb && \ + apt install --fix-broken && \ + rm libfftranscode*.deb + +# Install osmo-python-tests (for obtaining talloc reports from SUT) +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Configure git +RUN git config --global user.email docker(a)dock.er && \ + git config --global user.name "Dock Er" + +# +# Start of build + install titan from git +# (The rest is the same as debian-bookworm-titan) +# + +# Remember to adapt the URL fetching /root/titan.core-ver.json if TITAN_REPO_URL is changed! +ARG TITAN_REPO_URL=https://gitlab.eclipse.org/eclipse/titan/titan.core.git +ARG TITAN_BRANCH=master +ARG TITAN_REPO_DIR=titan.core + +# Install titan.core dependencies listed in debian/control +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + bison \ + debhelper \ + default-jdk \ + expect \ + flex \ + gcc \ + libedit-dev \ + libncurses5-dev \ + libpcap-dev \ + libpcre3-dev \ + libsctp-dev \ + libssl-dev \ + libxml2-dev \ + make \ + perl \ + python3 \ + && \ + apt-get clean + +# Clone and update the source code (if needed) +RUN git clone $TITAN_REPO_URL +ADD https://gitlab.eclipse.org/api/v4/projects/eclipse%2Ftitan%2Ftitan.core/rep… /root/titan.core-ver.json +RUN set -x && \ + cd $TITAN_REPO_DIR && \ + git fetch && git checkout -f -B $TITAN_BRANCH origin/$TITAN_BRANCH + +# Build + install titan.core onto /titan.core/Install +RUN set -x && \ + cd $TITAN_REPO_DIR && \ + make -j$(nproc) prefix=/usr install + +# Install files in proper places: +RUN set -x && \ + cd /$TITAN_REPO_DIR/Install && \ + cp -r bin/* /usr/bin/ && \ + mkdir -p /usr/share/titan/etc/ && cp -r etc/* /usr/share/titan/etc/ && \ + mkdir -p /usr/share/titan/help/ && cp -r help/* /usr/share/titan/help/ && \ + mkdir -p /usr/include/titan/ && cp -r include/* /usr/include/titan/ && \ + mkdir -p /usr/lib/titan/ && cp -r lib/* /usr/lib/titan/ + +# +# End of build + install titan from git +# + +# Clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) +RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \ + make -j8 -C /osmo-ttcn3-hacks deps +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/ma… /tmp/deps-Makefile +RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make -j8 deps; \ + fi diff --git a/debian-bookworm-titan-master/Makefile b/debian-bookworm-titan-master/Makefile new file mode 100644 index 0000000..ff6c155 --- /dev/null +++ b/debian-bookworm-titan-master/Makefile @@ -0,0 +1,3 @@ +include ../make/Makefile +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile new file mode 100644 index 0000000..99a79c8 --- /dev/null +++ b/debian-bookworm-titan/Dockerfile @@ -0,0 +1,75 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" + +# Copy from common dir +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc +COPY .common/pipework /usr/local/bin/pipework +COPY .common/ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare +COPY .common/ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run + +# Install packages from Debian repositories (alphabetic order) +ENV DEBIAN_FRONTEND=noninteractive +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + ca-certificates \ + git \ + iputils-ping \ + netcat-openbsd \ + procps \ + python3-setuptools \ + tcpdump \ + vim \ + wget \ + wireshark-common \ + && \ + apt-get clean + +# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER +RUN set -x && \ + export DPKG_ARCH="$(dpkg --print-architecture)" && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.5_${DPKG_… && \ + wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.5_${DP… && \ + dpkg -i ./libfftranscode0_0.5_${DPKG_ARCH}.deb ./libfftranscode-dev_0.5_${DPKG_ARCH}.deb && \ + apt install --fix-broken && \ + rm libfftranscode*.deb + +# Install osmo-python-tests (for obtaining talloc reports from SUT) +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ + cd osmo-python-tests && \ + python3 setup.py clean build install && \ + cd .. && \ + rm -rf osmo-python-tests + +# Configure git +RUN git config --global user.email docker(a)dock.er && \ + git config --global user.name "Dock Er" + +# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes +RUN echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + eclipse-titan \ + && \ + apt-get clean + +# Clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) +RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \ + make -j8 -C /osmo-ttcn3-hacks deps +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/ma… /tmp/deps-Makefile +RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make -j8 deps; \ + fi diff --git a/debian-bookworm-titan/Makefile b/debian-bookworm-titan/Makefile new file mode 100644 index 0000000..ff6c155 --- /dev/null +++ b/debian-bookworm-titan/Makefile @@ -0,0 +1,3 @@ +include ../make/Makefile +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4415fcde6518bd26d1e2cb5785ddaf84ac2116b3 Gerrit-Change-Number: 34048 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in osmo-e1d[master]: octoi: Add force-send-all-ts mode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/34149 ) Change subject: octoi: Add force-send-all-ts mode ...................................................................... octoi: Add force-send-all-ts mode This new mode (can be enabled per account) will force the E1OIP protocol to always send all timeslots, i.e. not do any of the suppression of timeslots that do not exhibit any change to the previous E1 frame. Change-Id: I6d17d3829b2c1c62e701a1d8c021d93d93593613 --- M include/osmocom/octoi/octoi.h M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_clnt_vty.c M src/octoi/octoi_srv_fsm.c M src/octoi/octoi_srv_vty.c M src/octoi/octoi_vty.h 8 files changed, 59 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/49/34149/1 diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h index fddee41..645af3f 100644 --- a/include/osmocom/octoi/octoi.h +++ b/include/osmocom/octoi/octoi.h @@ -22,6 +22,7 @@ char *user_id; /* user ID (IMSI) */ enum octoi_account_mode mode; uint8_t batching_factor; /* E1 frames per UDP packet (Tx) */ + bool force_send_all_ts; /* force transmission of all timeslots */ uint32_t prefill_frame_count; /* FIFO prefill/preseed count (Rx) */ union { struct { diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index c4bf054..85dd165 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -119,12 +119,16 @@ } iline_stat_set(iline, LINE_STAT_E1oIP_E1O_FIFO, frame_fifo_frames(&iline->e1o.fifo)); - /* then compute the ts_mask */ - for (i = 0, ref_frame = iline->e1o.last_frame; i < n_frames; i++, ref_frame = buf[i-1]) { - /* FIXME: what to do about TS0? */ - for (unsigned int j = 1; j < BYTES_PER_FRAME; j++) { - if (buf[i][j] != ref_frame[j]) - ts_mask |= (1U << j); + if (iline->cfg.force_send_all_ts) { + ts_mask = 0xfffffffe; + } else { + /* then compute the ts_mask */ + for (i = 0, ref_frame = iline->e1o.last_frame; i < n_frames; i++, ref_frame = buf[i-1]) { + /* FIXME: what to do about TS0? */ + for (unsigned int j = 1; j < BYTES_PER_FRAME; j++) { + if (buf[i][j] != ref_frame[j]) + ts_mask |= (1U << j); + } } } eith->ts_mask = htonl(ts_mask); @@ -314,10 +318,11 @@ } void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, - uint32_t prefill_frame_count) + uint32_t prefill_frame_count, bool force_send_all_ts) { iline->cfg.batching_factor = batching_factor; iline->cfg.prefill_frame_count = prefill_frame_count; + iline->cfg.force_send_all_ts = force_send_all_ts; } void e1oip_line_reset(struct e1oip_line *iline) diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index ccdebd5..9357d48 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -53,6 +53,7 @@ struct { uint8_t batching_factor; uint32_t prefill_frame_count; + bool force_send_all_ts; } cfg; /* E1 originated side (E1->IP) */ @@ -84,7 +85,7 @@ void e1oip_line_set_name(struct e1oip_line *line, const char *name); void e1oip_line_reset(struct e1oip_line *iline); void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, - uint32_t prefill_frame_count); + uint32_t prefill_frame_count, bool force_send_all_ts); void e1oip_line_destroy(struct e1oip_line *iline); int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg); diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index 2ec5c8c..2bfc8f9 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -123,7 +123,7 @@ struct clnt_state *st = fi->priv; e1oip_line_configure(st->peer->iline, st->acc->batching_factor, - st->acc->prefill_frame_count); + st->acc->prefill_frame_count, st->acc->force_send_all_ts); /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c index c7c2482..54ed60f 100644 --- a/src/octoi/octoi_clnt_vty.c +++ b/src/octoi/octoi_clnt_vty.c @@ -280,6 +280,8 @@ install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_ice1_line_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_mode_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_force_all_ts_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_no_force_all_ts_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); #ifdef HAVE_DAHDI_TRUNKDEV install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_trunkdev_name_cmd); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index ed9e8f9..b6914b7 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -176,7 +176,7 @@ struct srv_state *st = fi->priv; e1oip_line_configure(st->peer->iline, st->acc->batching_factor, - st->acc->prefill_frame_count); + st->acc->prefill_frame_count, st->acc->force_send_all_ts); /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index 67c4eb6..4fc4e47 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -391,6 +391,26 @@ return CMD_SUCCESS; } +gDEFUN(cfg_account_force_all_ts, cfg_account_force_all_ts_cmd, + "force-all-ts", + "Force transmission of all TS all the time\n") +{ + struct octoi_account *acc = vty->index; + + acc->force_send_all_ts = true; + return CMD_SUCCESS; +} + +gDEFUN(cfg_account_no_force_all_ts, cfg_account_no_force_all_ts_cmd, + "no force-all-ts", + NO_STR "Don't force transmission of all TS all the time\n") +{ + struct octoi_account *acc = vty->index; + + acc->force_send_all_ts = false; + return CMD_SUCCESS; +} + gDEFUN(cfg_account_prefill_frame_count, cfg_account_prefill_frame_count_cmd, "prefill-frame-count <0-8000>", "Number of E1 frames to pre-fill/pre-seed in Rx RIFO\n" @@ -455,6 +475,8 @@ VTY_NEWLINE); if (acc->batching_factor != DEFAULT_BATCHING_FACTOR) vty_out(vty, " batching-factor %u%s", acc->batching_factor, VTY_NEWLINE); + if (acc->force_send_all_ts) + vty_out(vty, " force-all-ts%s", VTY_NEWLINE); if (acc->prefill_frame_count != DEFAULT_PREFILL_FRAME_COUNT) vty_out(vty, " prefill-frame-count %u%s", acc->prefill_frame_count, VTY_NEWLINE); @@ -538,6 +560,8 @@ install_element(OCTOI_ACCOUNT_NODE, &cfg_account_ice1_line_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_redir_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_force_all_ts_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_no_force_all_ts_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); #ifdef HAVE_DAHDI_TRUNKDEV install_element(OCTOI_ACCOUNT_NODE, &cfg_account_trunkdev_name_cmd); diff --git a/src/octoi/octoi_vty.h b/src/octoi/octoi_vty.h index 33188e4..55fa7fe 100644 --- a/src/octoi/octoi_vty.h +++ b/src/octoi/octoi_vty.h @@ -8,6 +8,8 @@ extern struct cmd_element cfg_account_ice1_serno_cmd; extern struct cmd_element cfg_account_ice1_line_cmd; extern struct cmd_element cfg_account_batching_factor_cmd; +extern struct cmd_element cfg_account_force_all_ts_cmd; +extern struct cmd_element cfg_account_no_force_all_ts_cmd; extern struct cmd_element cfg_account_prefill_frame_count_cmd; extern struct cmd_element cfg_account_trunkdev_name_cmd; extern struct cmd_element cfg_account_trunkdev_line_cmd; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6d17d3829b2c1c62e701a1d8c021d93d93593613 Gerrit-Change-Number: 34149 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in pysim[master]: README.md: sort dependencies, document smpp.pdu

by fixeria

Attention is currently required from: Florian Klink, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34147 ) Change subject: README.md: sort dependencies, document smpp.pdu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I89760dd4008829c91fafbd442483d076c92a7ed4 Gerrit-Change-Number: 34147 Gerrit-PatchSet: 1 Gerrit-Owner: Florian Klink <flokli(a)flokli.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Florian Klink <flokli(a)flokli.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sun, 13 Aug 2023 18:06:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in pysim[master]: setup.py: fix package name

by fixeria

Attention is currently required from: Florian Klink, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34146 ) Change subject: setup.py: fix package name ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71ef6a19a487101e552219f10f2fa6215b966abd Gerrit-Change-Number: 34146 Gerrit-PatchSet: 1 Gerrit-Owner: Florian Klink <flokli(a)flokli.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Florian Klink <flokli(a)flokli.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sun, 13 Aug 2023 18:05:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023