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

[S] Change in osmo-dev[master]: ttcn3.sh: use ccache

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email ) Change subject: ttcn3.sh: use ccache ...................................................................... ttcn3.sh: use ccache Use ccache for building Osmocom programs and TTCN-3 testsuites. Change-Id: I800062d0379295a6905851db29e820ff16217653 --- M .gitignore M ttcn3/scripts/docker_configure_make.sh M ttcn3/ttcn3.opts M ttcn3/ttcn3.sh 4 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/01/34701/1 diff --git a/.gitignore b/.gitignore index 6aa1dd0..2e88651 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ !net/README !net/fill_config.py ttcn3/3G+2G_ttcn3.deps +ttcn3/ccache/ ttcn3/out/ ttcn3/make/ ttcn3/.run.sh diff --git a/ttcn3/scripts/docker_configure_make.sh b/ttcn3/scripts/docker_configure_make.sh index 25cedb4..56fee71 100755 --- a/ttcn3/scripts/docker_configure_make.sh +++ b/ttcn3/scripts/docker_configure_make.sh @@ -7,12 +7,13 @@ DIR_OSMODEV="$(readlink -f "$(dirname $0)/../..")" DIR_MAKE="$DIR_OSMODEV/ttcn3/make" DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local" +DIR_CCACHE="$DIR_OSMODEV/ttcn3/ccache/osmocom-programs" RUN_SCRIPT="$DIR_OSMODEV/ttcn3/.run.sh" DOCKER_IMG="$1" UID="$(id -u)" shift -mkdir -p "$DIR_MAKE" +mkdir -p "$DIR_MAKE" "$DIR_CCACHE" # Script running as user inside docker echo "#!/bin/sh -ex" > "$RUN_SCRIPT" @@ -29,6 +30,7 @@ -v "$DIR_OSMODEV:$DIR_OSMODEV" \ -v "$DIR_USR_LOCAL:/usr/local" \ -v "$RUN_SCRIPT:/tmp/run.sh:ro" \ + -v "$DIR_CCACHE:/home/build/.ccache" \ "$DOCKER_IMG" \ sh -ex -c " if ! id -u $UID 2>/dev/null; then diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts index 8acec2d..bf2f472 100644 --- a/ttcn3/ttcn3.opts +++ b/ttcn3/ttcn3.opts @@ -1 +1,2 @@ osmo-bts --enable-trx +ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++" diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 68dec64..5c5f711 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -338,16 +338,19 @@ local testsuite_image="$(get_testsuite_image)" echo "testsuite_image: $testsuite_image" + mkdir -p "$"$DIR_OSMODEV/ttcn3/ccache/ttcn3 + # -t: add a tty, so we get color output from the compiler docker run \ --rm \ -t \ -v "$hacks:/osmo-ttcn3-hacks" \ + -v "$DIR_OSMODEV/ttcn3/ccache/ttcn3:/root/.ccache" \ "$testsuite_image" \ sh -exc " cd /osmo-ttcn3-hacks/$(basename "$(get_testsuite_dir)"); ./gen_links.sh; - ./regen_makefile.sh; + USE_CCACHE=1 ./regen_makefile.sh; make compile; make -j"$JOBS" " -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I800062d0379295a6905851db29e820ff16217653 Gerrit-Change-Number: 34701 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: use nproc for JOBS

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/34702?usp=email ) Change subject: ttcn3.sh: use nproc for JOBS ...................................................................... ttcn3.sh: use nproc for JOBS Change-Id: I1971e7758e67a4260ae1398d510cb719db45d101 --- M ttcn3/ttcn3.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/02/34702/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 5c5f711..54b4328 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -5,7 +5,7 @@ DIR_MAKE="${DIR_MAKE:-${DIR_OSMODEV}/ttcn3/make}" DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}" DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local" -JOBS="${JOBS:-9}" +JOBS="$(nproc)" # Osmocom libraries and programs relevant for the current testsuite will be # built in this container. It must have all build dependencies available and -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I1971e7758e67a4260ae1398d510cb719db45d101 Gerrit-Change-Number: 34702 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-pcu-test: use PFUIF v10 for 2023q1

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ttcn3-pcu-test: use PFUIF v10 for 2023q1 ...................................................................... ttcn3-pcu-test: use PFUIF v10 for 2023q1 Change-Id: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 --- M jenkins-common.sh M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/sns/PCU_Tests.cfg 5 files changed, 34 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/98/34698/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34698?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: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 Gerrit-Change-Number: 34698 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 8 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-pcu-test: use PFUIF v10 for 2023q1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email ) Change subject: ttcn3-pcu-test: use PFUIF v10 for 2023q1 ...................................................................... ttcn3-pcu-test: use PFUIF v10 for 2023q1 Change-Id: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 --- M jenkins-common.sh M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/sns/PCU_Tests.cfg 5 files changed, 35 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/98/34698/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 72eaec2..90ad8cc 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -502,6 +502,15 @@ esac } +# Check if IMAGE_SUFFIX starts with "2023q1" (e.g. "2023q1-centos8") +image_suffix_is_2023q1() { + case "$IMAGE_SUFFIX" in + 2023q1*) return 0 ;; + *) return 1 ;; + esac +} + + # Write the Osmocom repository to the TTCN3 config file, so the tests may take # different code paths (OS#5327) # $1: path to TTCN3 config file (e.g. BSC_Tests.cfg) diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 40b8e2c..b3f3b8f 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -34,7 +34,8 @@ } } } -Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU" +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 393e828..50027d3 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -9,10 +9,17 @@ set_clean_up_trap set -e +set_pcuif_version() { + if image_suffix_is_2023q1; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi +} + mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index ee53bb7..0a1eb67 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -9,10 +9,17 @@ set_clean_up_trap set -e +set_pcuif_version() { + if image_suffix_is_2023q1; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi +} + mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index 1036f5a..d62f52d 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -59,6 +59,7 @@ } } } +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34698?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: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 Gerrit-Change-Number: 34698 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 8 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF

by pespin

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email ) Change subject: pcu_l1_if: signal BTS model via PCUIF ...................................................................... Patch Set 1: (1 comment) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34647/comment/558bfaf8_4e38ec73 PS1, Line 70: #define PCU_IF_BTS_MODEL_UNSPEC 0x00 > I have opted against an enum since the other fields also do not use enums (see the defines above). […] I definetly want an enum here. The field in the struct can remain a uint of known size. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 11:36:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF

by dexter

Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email ) Change subject: pcu_l1_if: signal BTS model via PCUIF ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: > This is something that needs to be done carefully: you're adding a new field, but the PCUIF version […] I have had a look at this. I think CHECK_IF_MSG_SIZE may tolerate this. It checks if the length of the date it received is smaller than the indication. In case more data is received, the check won't be set off. This would mean newer osmo-bts/osmo-bsc would definetly work with older osmo-pcu versions, but the other way around there may be problems (I didn't count out the bytes) So yes, I also think this means that we must increment the PCUIF version again. But before we do this we should drop the backward compatibility clutter in osmo-pcu and the TTCN3 tests to have a clean path. File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34647/comment/3233b29d_d9bd2d85 PS1, Line 70: #define PCU_IF_BTS_MODEL_UNSPEC 0x00 > can we please have an enum? I have opted against an enum since the other fields also do not use enums (see the defines above). I think an enum will look a bit out of place there. What do you think? Shall I still migrate this to an enum? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 11:17:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[M] Change in pysim[master]: transport: do not catch exceptions in init_reader

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34697?usp=email ) Change subject: transport: do not catch exceptions in init_reader ...................................................................... Patch Set 1: Code-Review-1 (3 comments) Patchset: PS1: You also need to revisit all the callers of this function and remove checking the returned value against `None`. File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34697/comment/820824d2_7fd9f482 PS1, Line 295: Optional no more `Optional` https://gerrit.osmocom.org/c/pysim/+/34697/comment/37749619_b883fcb3 PS1, Line 299: sl = None # type : :Optional[LinkBase] not needed anymore -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 Gerrit-Change-Number: 34697 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 11:02:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[S] Change in pysim[master]: transport: add return type annotation to method __str__

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34696?usp=email ) Change subject: transport: add return type annotation to method __str__ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I26d3d2714708dbe957704b60d17ba2afa325b2c4 Gerrit-Change-Number: 34696 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 11:01:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[M] Change in pysim[master]: transport: do not catch exceptions in init_reader

by dexter

Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34697?usp=email ) Change subject: transport: do not catch exceptions in init_reader ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This patch now removes the exception handling. When this patch is merged we can take on the layer violation problem that @laforge@gnumonks.org mentioned. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 Gerrit-Change-Number: 34697 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 10:40:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

[S] Change in pysim[master]: transport: show full traceback on failed reader init

by dexter

Attention is currently required from: fixeria, laforge, osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34687?usp=email ) Change subject: transport: show full traceback on failed reader init ...................................................................... Patch Set 6: (1 comment) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34687/comment/fea4e2d2_348abe47 PS4, Line 318: except Exception as e > I am wondering if we really need to catch exceptions here. […] I also think that not catching the exception at all would be the better solution. The caller still has the option to handle the exception and print it nicely if he wants to. I submitted the new approach here: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46e913a516dbc13f7610512484f515ab25d3fbae Gerrit-Change-Number: 34687 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 10:38:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2023