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

Change in docker-playground[master]: release-tarball: support git submodules

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/31248 to look at the new patch set (#2). Change subject: release-tarball: support git submodules ...................................................................... release-tarball: support git submodules osmo-trx 1.5.0 is now using a git submodule for osmocom-bb, so add support for it. Change-Id: I35e9ef6d976ae8cf2bfb4f3c410e6b2cb3ca7841 --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/31248/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I35e9ef6d976ae8cf2bfb4f3c410e6b2cb3ca7841 Gerrit-Change-Number: 31248 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: release-tarball: support git submodules

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31248 ) Change subject: release-tarball: support git submodules ...................................................................... release-tarball: support git submodules osmo-trx 1.5.0 is now using a git submodule for osmocom-bb, so add support for it. Change-Id: I35e9ef6d976ae8cf2bfb4f3c410e6b2cb3ca7841 --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/48/31248/1 diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index e49c03b..1831fda 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -208,13 +208,14 @@ local tag="${2:-master}" if ! [ -d "$TEMP/repos/$repo" ]; then - git -C "$TEMP/repos" clone "$OSMO_GIT_URL/$repo" + git -C "$TEMP/repos" clone --recursive "$OSMO_GIT_URL/$repo" fi cd "$TEMP/repos/$repo" git clean -qdxf git reset --hard HEAD # in case the tracked files were modified (e.g. libsmpp34 1.10) git checkout -q "$tag" + git submodule update --recursive --remote } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I35e9ef6d976ae8cf2bfb4f3c410e6b2cb3ca7841 Gerrit-Change-Number: 31248 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: release-tarball: fix osmo-trx 1.5.0

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31249 ) Change subject: release-tarball: fix osmo-trx 1.5.0 ...................................................................... release-tarball: fix osmo-trx 1.5.0 Run configure with the --with-mstrx argument, so LIBTRXCON_DIR is not pointing at an empty directory. Fix for: make[2]: Entering directory '/build/_temp/repos/osmo-trx/osmocom-bb' make[2]: *** No rule to make target 'distdir'. Stop. Change-Id: I2f067409f98119d4e35cf86cc2c816fc3c19e3f5 --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/49/31249/1 diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 1831fda..628bb3c 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -156,6 +156,23 @@ esac } +# Run ./configure, with arguments if needed. +# $1: Osmocom repository +run_configure() { + case "$1" in + osmo-trx) + # Avoid pointing LIBTRXCON_DIR to an empty directory: + # https://gerrit.osmocom.org/c/osmo-trx/+/30792 + if grep -q with_mstrx configure.ac; then + ./configure --with-mstrx + fi + ;; + *) + ./configure + ;; + esac +} + # Apply workarounds for bugs that break too many releases. This function runs between ./configure and make dist-bzip2. # $1: Osmocom repository fix_repo() { @@ -243,7 +260,7 @@ cd "$TEMP/repos/$repo" autoreconf -fi - ./configure + run_configure "$repo" fix_repo "$repo" make dist-bzip2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2f067409f98119d4e35cf86cc2c816fc3c19e3f5 Gerrit-Change-Number: 31249 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: release-tarball: remove PARALLEL_MAKE variable

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31250 ) Change subject: release-tarball: remove PARALLEL_MAKE variable ...................................................................... release-tarball: remove PARALLEL_MAKE variable Probably copy pasted from another script, doesn't make much sense here since only the release tarballs are built. Nothing gets compiled here, the variable was not used. Change-Id: Ie74ee6976759f9634503b21e964e93efcc925679 --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/50/31250/1 diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 628bb3c..1229591 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -5,7 +5,6 @@ # # Environment variables: # * KEEP_TEMP: do not delete cloned repositories (use for development) -# * PARALLEL_MAKE: -jN argument for make (default: -j5). SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48" OSMO_GIT_URL="https://git.osmocom.org" OSMO_RELEASE_REPOS=" @@ -73,7 +72,6 @@ cd "$(dirname "$0")" -PARALLEL_MAKE="${PARALLEL_MAKE:--j5}" OUTPUT="/build/_release_tarballs" TEMP="/build/_temp" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie74ee6976759f9634503b21e964e93efcc925679 Gerrit-Change-Number: 31250 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: release-tarball: add missing cd /build

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31247 ) Change subject: release-tarball: add missing cd /build ...................................................................... release-tarball: add missing cd /build Fix for: upload: no tarballs generated, nothing to do. Change-Id: I047546b26f379c5302d8558b92b77e4fa311a0a0 --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/31247/1 diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 40f8c5e..e49c03b 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -370,6 +370,7 @@ done done +cd /build remove_temp_dir upload echo "done!" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I047546b26f379c5302d8558b92b77e4fa311a0a0 Gerrit-Change-Number: 31247 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: release-tarball: add var to use list from jenkins

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31251 ) Change subject: release-tarball: add var to use list from jenkins ...................................................................... release-tarball: add var to use list from jenkins Add a parameter that can be used to reproduce the failure locally with the last list from jenkins, without having SSH set up to download the list of existing tarballs. Change-Id: I9af310c24aa65c21cc4bd365d3df7804cba02df7 --- M release-tarball-build-dist/Dockerfile M release-tarball-build-dist/jenkins.sh M release-tarball-build-dist/osmocom-release-tarballs.sh 3 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/31251/1 diff --git a/release-tarball-build-dist/Dockerfile b/release-tarball-build-dist/Dockerfile index dcfea51..e8ffd21 100644 --- a/release-tarball-build-dist/Dockerfile +++ b/release-tarball-build-dist/Dockerfile @@ -69,6 +69,7 @@ mscgen \ python3-nwdiag \ rsync \ + wget \ xsltproc \ && \ apt-get clean diff --git a/release-tarball-build-dist/jenkins.sh b/release-tarball-build-dist/jenkins.sh index d59aa15..8ea3c27 100755 --- a/release-tarball-build-dist/jenkins.sh +++ b/release-tarball-build-dist/jenkins.sh @@ -10,6 +10,7 @@ -v "$PWD:/build" \ -v "$(readlink -f $SSH_AUTH_SOCK)":/ssh-agent \ -w /osmo-ci \ + -e EXISTING_TARBALLS_FROM_JENKINS="$EXISTING_TARBALLS_FROM_JENKINS" \ -e KEEP_TEMP="$KEEP_TEMP" \ -e SSH_AUTH_SOCK=/ssh-agent \ "$USER/release-tarball-build-dist" sh -e /build/osmocom-release-tarballs.sh diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 1229591..4dc2bdd 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -5,6 +5,8 @@ # # Environment variables: # * KEEP_TEMP: do not delete cloned repositories (use for development) +# * EXISTING_TARBALLS_FROM_JENKINS: set to 1 to get the existing tarballs from +# the last run of the jenkins job SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48" OSMO_GIT_URL="https://git.osmocom.org" OSMO_RELEASE_REPOS=" @@ -207,7 +209,10 @@ } get_existing_tarballs() { - if ! $SSH_COMMAND releases(a)ftp.osmocom.org -- \ + if [ -n "$EXISTING_TARBALLS_FROM_JENKINS" ]; then + wget -O "$TEMP"/existing_tarballs \ + https://jenkins.osmocom.org/jenkins/job/Osmocom-release-tarballs/ws/release… + elif ! $SSH_COMMAND releases(a)ftp.osmocom.org -- \ find web-files -name '*.tar.bz2' \ > "$TEMP"/existing_tarballs; then echo "ERROR: getting existing tarballs from remote failed!" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9af310c24aa65c21cc4bd365d3df7804cba02df7 Gerrit-Change-Number: 31251 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Update UIT version expectancies after Osmocom CNI release 202302

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 ) Change subject: Update UIT version expectancies after Osmocom CNI release 202302 ...................................................................... Update UIT version expectancies after Osmocom CNI release 202302 Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d --- M bsc/BSC_Tests.ttcn M gbproxy/GBProxy_Tests.ttcn 2 files changed, 15 insertions(+), 28 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 6902744..439b234 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1301,15 +1301,13 @@ f_wait_oml(bts_idx, "connected", 5.0); /* Set up BTS with VTY commands: */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - f_vty_enter_cfg_bts(BSCVTY, bts_idx); - if (g_osmux_enabled_bts) { - f_vty_transceive(BSCVTY, "osmux on"); - } else { - f_vty_transceive(BSCVTY, "osmux off"); - } - f_vty_transceive(BSCVTY, "end"); + f_vty_enter_cfg_bts(BSCVTY, bts_idx); + if (g_osmux_enabled_bts) { + f_vty_transceive(BSCVTY, "osmux on"); + } else { + f_vty_transceive(BSCVTY, "osmux off"); } + f_vty_transceive(BSCVTY, "end"); } function f_init_bts_and_check_sysinfo(integer bts_idx := 0, @@ -3616,9 +3614,7 @@ /* read counters before paging */ paging_attempted_bsc := f_ctrl_get_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:attempted"); - if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.8.0 */ - paging_expired_bsc := f_ctrl_get_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired"); - } + paging_expired_bsc := f_ctrl_get_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired"); for (i := 0; i < NUM_BTS; i := i+1) { paging_attempted_bts[i] := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", i, "paging:attempted"); paging_expired_bts[i] := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", i, "paging:expired"); @@ -3635,9 +3631,7 @@ /* assume that 12s later the paging on all BTSs have expired and hence incremented by 1 */ f_sleep(12.0); - if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.8.0 */ - f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired", paging_expired_bsc+1); - } + f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired", paging_expired_bsc+1); for (i := 0; i < NUM_BTS; i := i+1) { f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", i, "paging:expired", paging_expired_bts[i]+1); @@ -12454,12 +12448,9 @@ execute( TC_chan_alloc_algo_ass_dynamic() ); /* MGW pool */ - /* TODO: this conditional canbe dropped once osmo-bsc >1.10.0 is released: */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_mgwpool_all_used() ); - execute( TC_mgwpool_blocked_not_used() ); - execute( TC_mgwpool_pin_bts() ); - } + execute( TC_mgwpool_all_used() ); + execute( TC_mgwpool_blocked_not_used() ); + execute( TC_mgwpool_pin_bts() ); execute( TC_ho_meas_rep_multi_band() ); diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 9f7d17a..d32e3bb 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -3701,10 +3701,8 @@ control { execute( TC_BVC_bringup() ); - /* Depends on osmo-gbproxy > 0.2.0 */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_BVC_bringup_conflicting() ); - } + execute( TC_BVC_bringup_conflicting() ); + execute( TC_ul_unitdata() ); execute( TC_ul_unitdata_pool_failure() ); execute( TC_dl_unitdata() ); @@ -3786,10 +3784,8 @@ execute( TC_flush_ll_bvci_new() ); - /* Depends on osmo-gbproxy > 0.2.0 */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_flush_ll_no_bvci_new() ); - } + execute( TC_flush_ll_no_bvci_new() ); + execute( TC_fc_bvc() ); execute( TC_fc_ms() ); execute( TC_ms_reg_enq() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d Gerrit-Change-Number: 31246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Update UIT version expectancies after Osmocom CNI release 202302

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 ) Change subject: Update UIT version expectancies after Osmocom CNI release 202302 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d Gerrit-Change-Number: 31246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Feb 2023 11:54:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Update UIT version expectancies after Osmocom CNI release 202302

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 to look at the new patch set (#2). Change subject: Update UIT version expectancies after Osmocom CNI release 202302 ...................................................................... Update UIT version expectancies after Osmocom CNI release 202302 Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d --- M bsc/BSC_Tests.ttcn M gbproxy/GBProxy_Tests.ttcn 2 files changed, 15 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/31246/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d Gerrit-Change-Number: 31246 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: : Update UIT version expectancies after Osmocom CNI release 202302

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 ) Change subject: : Update UIT version expectancies after Osmocom CNI release 202302 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d Gerrit-Change-Number: 31246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Feb 2023 11:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023