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

[S] Change in osmo-ci[master]: ansible: jenkins: debian: sort packages
by pespin 17 Oct '23

17 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34795?usp=email ) Change subject: ansible: jenkins: debian: sort packages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34795?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: If4ce784821cc40a2e795afafa452c99bf0588253 Gerrit-Change-Number: 34795 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: Tue, 17 Oct 2023 17:20:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: jenkins: debian: add python3-setuptools
by pespin 17 Oct '23

17 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34796?usp=email ) Change subject: ansible: jenkins: debian: add python3-setuptools ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34796?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: I1ff0711b7b29ba4dc78f51f257b986d7a0994a96 Gerrit-Change-Number: 34796 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: Tue, 17 Oct 2023 17:20:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: Introduce osmo-epdg-master
by pespin 17 Oct '23

17 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34797?usp=email ) Change subject: Introduce osmo-epdg-master ...................................................................... Introduce osmo-epdg-master Related: OS#6204 Change-Id: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5 --- M jenkins-common.sh M make/Makefile A osmo-epdg-master/Dockerfile A osmo-epdg-master/Makefile A osmo-epdg-master/osmo-epdg.config 5 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/97/34797/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index c9299df..4e476f6 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -22,6 +22,7 @@ osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; + osmo-epdg-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; ttcn3-*) echo "debian-bookworm-titan" ;; diff --git a/make/Makefile b/make/Makefile index f007f2a..7266662 100644 --- a/make/Makefile +++ b/make/Makefile @@ -24,6 +24,7 @@ OSMO_BTS_BRANCH?=master OSMO_CBC_BRANCH?=master OSMO_DIA2GSUP_BRANCH?=master +OSMO_EPDG_BRANCH?=master OSMO_GBPROXY_BRANCH?=master OSMO_GGSN_BRANCH?=master OSMO_GSM_TESTER_BRANCH?=master @@ -105,6 +106,7 @@ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ --build-arg OSMO_CBC_BRANCH=$(OSMO_CBC_BRANCH) \ --build-arg OSMO_DIA2GSUP_BRANCH=$(OSMO_DIA2GSUP_BRANCH) \ + --build-arg OSMO_EPDG_BRANCH=$(OSMO_EPDG_BRANCH) \ --build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ --build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \ diff --git a/osmo-epdg-master/Dockerfile b/osmo-epdg-master/Dockerfile new file mode 100644 index 0000000..58ccf9a --- /dev/null +++ b/osmo-epdg-master/Dockerfile @@ -0,0 +1,28 @@ +ARG USER +ARG DISTRO +FROM $USER/$DISTRO-erlang +# Arguments used after FROM must be specified again +ARG DISTRO + +WORKDIR /tmp + +ARG OSMO_EPDG_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/erlang/osmo-epdg.git +ADD https://gerrit.osmocom.org/plugins/gitiles/erlang/osmo-epdg/+/$OSMO_EPDG_BR… /tmp/commit-osmo-epdg + +RUN cd osmo-epdg && \ + git fetch && git checkout $OSMO_EPDG_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_EPDG_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + rebar3 compile && \ + rebar3 escriptize + +VOLUME /data + +COPY osmo-epdg.config /data/osmo-epdg.config + +WORKDIR /data +CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo-epdg.config' /tmp/osmo-epdg/_build/default/bin/osmo-epdg > /data/osmo-epdg.log 2>&1"] + +#EXPOSE diff --git a/osmo-epdg-master/Makefile b/osmo-epdg-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-epdg-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-epdg-master/osmo-epdg.config b/osmo-epdg-master/osmo-epdg.config new file mode 100644 index 0000000..be49216 --- /dev/null +++ b/osmo-epdg-master/osmo-epdg.config @@ -0,0 +1,2 @@ +[{osmo_epdg, [ +]}]. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34797?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: Iefc43ffa47f443f2826b8979d4dd0c5542dda1c5 Gerrit-Change-Number: 34797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: Introduce ttcn3-epdg-test
by pespin 17 Oct '23

17 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34798?usp=email ) Change subject: Introduce ttcn3-epdg-test ...................................................................... Introduce ttcn3-epdg-test Change-Id: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204 --- A ttcn3-epdg-test/Dockerfile A ttcn3-epdg-test/EPDG_Tests.cfg A ttcn3-epdg-test/Makefile A ttcn3-epdg-test/jenkins.sh A ttcn3-epdg-test/osmo-epdg.config 5 files changed, 102 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/98/34798/1 diff --git a/ttcn3-epdg-test/Dockerfile b/ttcn3-epdg-test/Dockerfile new file mode 100644 index 0000000..e3fd8a3 --- /dev/null +++ b/ttcn3-epdg-test/Dockerfile @@ -0,0 +1,14 @@ +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" epdg + +VOLUME /data + +COPY EPDG_Tests.cfg /data/EPDG_Tests.cfg + +CMD ttcn3-docker-run epdg EPDG_Tests diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg new file mode 100644 index 0000000..f05a819 --- /dev/null +++ b/ttcn3-epdg-test/EPDG_Tests.cfg @@ -0,0 +1,21 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/epdg/EPDG_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +EPDG_Tests.mp_gsup_local_ip := "172.18.10.103" +EPDG_Tests.mp_swx_local_ip := "172.18.10.103" +EPDG_Tests.mp_s6b_local_ip := "172.18.10.103" +EPDG_Tests.mp_s2b_local_ip := "172.18.10.103" + +EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20" +EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20" + +[MAIN_CONTROLLER] + +[EXECUTE] +EPDG_Tests.control diff --git a/ttcn3-epdg-test/Makefile b/ttcn3-epdg-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-epdg-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-epdg-test/jenkins.sh b/ttcn3-epdg-test/jenkins.sh new file mode 100755 index 0000000..df445fc --- /dev/null +++ b/ttcn3-epdg-test/jenkins.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-epdg-$IMAGE_SUFFIX" \ + "ttcn3-epdg-test" + +set_clean_up_trap +set -e + +mkdir $VOL_BASE_DIR/epdg-tester +cp EPDG_Tests.cfg $VOL_BASE_DIR/epdg-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/epdg-tester/EPDG_Tests.cfg" + +mkdir $VOL_BASE_DIR/epdg +cp osmo-epdg.config $VOL_BASE_DIR/epdg/ + +network_create +network_replace_subnet_in_configs + +echo Starting container with osmo-epdg +docker run --rm \ + $(docker_network_params $SUBNET 20) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/epdg:/data \ + --name ${BUILD_TAG}-epdg -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-epdg-$IMAGE_SUFFIX + +echo Starting container with EPDG testsuite +docker run --rm \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/epdg-tester:/data \ + --name ${BUILD_TAG}-ttcn3-epdg-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-epdg-test diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config new file mode 100644 index 0000000..ac8828a --- /dev/null +++ b/ttcn3-epdg-test/osmo-epdg.config @@ -0,0 +1,18 @@ +[ + %% =========================================== + %% Application config + %% =========================================== + {osmo_epdg, + [% GSUP Server connection parameters + {gsup_local_ip, "172.18.10.20"}, + {gsup_local_port, 4222}, + % Diameter Connection parameters + {diameter_remote_ip, "172.18.10.103"}, + {diameter_remote_port, 3868}, + {diameter_proto, sctp}, + % Diameter Server parameters + {vendor_id, 0}, + {origin_host, "epdg.localdomain"}, + {origin_realm, "localdomain"}, + {context_id, "epdg@localdomain"}]} +]. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34798?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: I77a4d66c1bd0236dee8fc54e03a9d6bf8d63f204 Gerrit-Change-Number: 34798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: WIP: gsup: add message type for osmo-epdg CEIA interface
by pespin 17 Oct '23

17 Oct '23

Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email ) Change subject: WIP: gsup: add message type for osmo-epdg CEIA interface ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Duplicate of https://gerrit.osmocom.org/c/libosmocore/+/34784 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3 Gerrit-Change-Number: 32033 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 17 Oct 2023 16:48:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible: jenkins: debian: add python3-setuptools
by osmith 17 Oct '23

17 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34796?usp=email ) Change subject: ansible: jenkins: debian: add python3-setuptools ...................................................................... ansible: jenkins: debian: add python3-setuptools Install the package, as it is needed to run the update-osmo-python-on-slaves jenkins job. Related: OS#6186 Change-Id: I1ff0711b7b29ba4dc78f51f257b986d7a0994a96 --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/96/34796/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 102d0b8..ed4d2da 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -7,6 +7,7 @@ - fakeroot - htop - proot + - python3-setuptools - qemu-system-arm - qemu-user-static - virt-manager -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34796?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: I1ff0711b7b29ba4dc78f51f257b986d7a0994a96 Gerrit-Change-Number: 34796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/update-osmo-*: add build3-deb11build-ansible
by osmith 17 Oct '23

17 Oct '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email to look at the new patch set (#2). Change subject: jobs/update-osmo-*: add build3-deb11build-ansible ...................................................................... jobs/update-osmo-*: add build3-deb11build-ansible Related: OS#6186 Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 --- M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/34794/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?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: I1f732718df87ed3b850332dbf1a7f6b2f854f280 Gerrit-Change-Number: 34794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ci[master]: ansible: jenkins: debian: sort packages
by osmith 17 Oct '23

17 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34795?usp=email ) Change subject: ansible: jenkins: debian: sort packages ...................................................................... ansible: jenkins: debian: sort packages Related: OS#6186 Change-Id: If4ce784821cc40a2e795afafa452c99bf0588253 --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/95/34795/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 3743043..102d0b8 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -3,13 +3,13 @@ - name: install jenkins utilities apt: name: - - htop - - virt-manager - - qemu-user-static - - qemu-system-arm - - proot - debootstrap - fakeroot + - htop + - proot + - qemu-system-arm + - qemu-user-static + - virt-manager cache_valid_time: 3600 update_cache: yes install_recommends: no -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34795?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: If4ce784821cc40a2e795afafa452c99bf0588253 Gerrit-Change-Number: 34795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/update-osmo-*: add build3-deb11build-ansible
by osmith 17 Oct '23

17 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34794?usp=email ) Change subject: jobs/update-osmo-*: add build3-deb11build-ansible ...................................................................... jobs/update-osmo-*: add build3-deb11build-ansible Change-Id: I1f732718df87ed3b850332dbf1a7f6b2f854f280 --- M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/34794/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index e9f80b1..2b1d81f 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -9,6 +9,7 @@ - build2-deb10build-ansible - build2-deb11build-ansible - build3-deb11build-ansible + - build4-deb12build-ansible - gtp0-deb10fr - host2-deb11build-ansible - rpi4-raspbian11build-ansible-1 diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 8147b4f..0842fba 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -9,6 +9,7 @@ - build2-deb10build-ansible - build2-deb11build-ansible - build3-deb11build-ansible + - build4-deb12build-ansible - host2-deb11build-ansible - rpi4-raspbian11build-ansible-1 - rpi4-raspbian11build-ansible-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34794?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: I1f732718df87ed3b850332dbf1a7f6b2f854f280 Gerrit-Change-Number: 34794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: ASCI: Register state machines only once, when the application starts
by laforge 17 Oct '23

17 Oct '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34792?usp=email ) Change subject: ASCI: Register state machines only once, when the application starts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34792?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I46d68e31e0bfd6a64c190e439f45b24502dd1f30 Gerrit-Change-Number: 34792 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 17 Oct 2023 15:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0