September 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: hnbgw: Add missing results to expected-results.xml

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29494 ) Change subject: hnbgw: Add missing results to expected-results.xml ...................................................................... hnbgw: Add missing results to expected-results.xml Change-Id: I26ccbaa2b071af981bf707b41bc26fb86de62d77 --- M hnbgw/expected-results.xml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/29494/1 diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index cc77dc6..3b338bf 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -1,6 +1,8 @@ <?xml version="1.0"?> <testsuite name='Titan' tests='13' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='HNBGW_Tests' name='TC_hnb_register' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate_reuse_sctp_assoc' time='MASKED' <testcase classname='HNBGW_Tests' name='TC_ranap_cs_initial_ue' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_ps_initial_ue' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_cs_initial_ue_empty_cr' time='MASKED'/> @@ -13,4 +15,6 @@ <testcase classname='HNBGW_Tests' name='TC_rab_assign_mgcp_to' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_cs_mo_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_ps_mo_disconnect' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment_without_pfcp' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_hnb_reregister_reuse_sctp_assoc' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29494 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: I26ccbaa2b071af981bf707b41bc26fb86de62d77 Gerrit-Change-Number: 29494 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-bsc-nat[master]: [do not merge] test rpm/deb CI

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/29492 ) Change subject: [do not merge] test rpm/deb CI ...................................................................... [do not merge] test rpm/deb CI Change-Id: I6842b5c641e6b6a0cfb428c7538e0a041751143e --- A test 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/92/29492/1 diff --git a/test b/test new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/29492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I6842b5c641e6b6a0cfb428c7538e0a041751143e Gerrit-Change-Number: 29492 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: scripts/common: remove osmo_git_clone_date

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29488 ) Change subject: scripts/common: remove osmo_git_clone_date ...................................................................... scripts/common: remove osmo_git_clone_date This had been added for debugging purposes and isn't used anymore. Also one less hit for git grep git.osmocom.org. Change-Id: I10cbb598f0d5d675034ca87568a8b6f1920f2ad3 --- M scripts/common.sh 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/common.sh b/scripts/common.sh index 6d93cc8..227f965 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -110,16 +110,6 @@ echo "$ret" | cut -d/ -f 3 } -# Pass all arguments to "git clone", but write the current date and time before the clone and on failure. -# This helps analyzing errors with git.osmocom.org (OS#4083). -osmo_git_clone_date() { - date "+%Y-%m-%d %H:%M:%S" - if ! git clone "$@"; then - date "+%Y-%m-%d %H:%M:%S" - exit 1 - fi -} - # Echo git clone URL for an Osmocom git repository. For projects developed on # gerrit, use the gerrit URL to avoid the mirror sync delay, for other # repositories use the gitea URL. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I10cbb598f0d5d675034ca87568a8b6f1920f2ad3 Gerrit-Change-Number: 29488 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: Replace most remaining git.osmocom.org urls

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29489 ) Change subject: Replace most remaining git.osmocom.org urls ...................................................................... Replace most remaining git.osmocom.org urls Replace the legacy git.osmocom.org clone URLs with either gerrit or gitea in most places. Besides not using legacy urls anymore, the advantage of using gerrit directly is that we don't have a delay of 10 min to several hours on the repository. Not replaced: * ansible/roles/osmocom-workstation: not sure if still used, would need a bit of a rewrite to use logic similar to osmo_git_clone_url(). Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure Change-Id: I90409c9e7f4db4e1765647021625f9acfccaa78b --- M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml M ansible/setup-gsm-tester.yml M contrib/jenkins.sh M jobs/osmocom-build-tags-against-master.yml M jobs/osmocom-depcheck.yml M jobs/osmocom-list-commits.yml M jobs/osmocom-obs.yml M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml M scripts/common.sh M scripts/osmo-build.sh M scripts/osmo-depcheck/config.py M scripts/osmo-depcheck/dependencies.py M scripts/osmo-layer1-headers.sh 15 files changed, 18 insertions(+), 18 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml index b26d6ab..a19dcaf 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml @@ -8,14 +8,14 @@ become: yes become_user: "{{ jenkins_user }}" git: - repo: "https://git.osmocom.org/osmo-ci" + repo: "https://gerrit.osmocom.org/osmo-ci" dest: "/home/{{ jenkins_user }}/osmo-ci" - name: deploy osmo-gsm-manuals to home directory become: yes become_user: "{{ jenkins_user }}" git: - repo: "https://git.osmocom.org/osmo-gsm-manuals" + repo: "https://gerrit.osmocom.org/osmo-gsm-manuals" dest: "/home/{{ jenkins_user }}/osmo-gsm-manuals" - name: rebuild osmocom docker images for jenkins build tests diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index 0910102..1e61fe5 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -11,7 +11,7 @@ become: yes become_user: "{{ jenkins_user }}" git: - repo: "https://git.osmocom.org/docker-playground" + repo: "https://gerrit.osmocom.org/docker-playground" dest: "/home/{{ jenkins_user }}/jenkins/docker-playground" - name: add apt.key diff --git a/ansible/setup-gsm-tester.yml b/ansible/setup-gsm-tester.yml index 34976d7..9d27256 100644 --- a/ansible/setup-gsm-tester.yml +++ b/ansible/setup-gsm-tester.yml @@ -18,7 +18,7 @@ become: yes become_user: "jenkins" git: - repo: "https://git.osmocom.org/osmo-ci" + repo: "https://gerrit.osmocom.org/osmo-ci" dest: "/home/jenkins/osmo-ci" roles: - name: gsm-tester diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a15ea05..300d38c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,7 +4,7 @@ # Clone repository to ~/, or update existing # $1: name of osmocom project clone_repo() { - cd ~/"$1" || (cd ~/ && git clone https://git.osmocom.org/"$1" && cd ~/"$1") + cd ~/"$1" || (cd ~/ && git clone https://gerrit.osmocom.org/"$1" && cd ~/"$1") git rev-parse HEAD git status diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index 22ac9ae..351aff2 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -25,7 +25,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml index 1eadd0e..4ca04e2 100644 --- a/jobs/osmocom-depcheck.yml +++ b/jobs/osmocom-depcheck.yml @@ -26,7 +26,7 @@ name: GIT_URL_PREFIX description: | Where to clone the sources from - default: 'https://git.osmocom.org/' + default: 'https://gerrit.osmocom.org/' - bool: name: BUILD description: | @@ -65,7 +65,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' diff --git a/jobs/osmocom-list-commits.yml b/jobs/osmocom-list-commits.yml index c9995c6..65bec81 100644 --- a/jobs/osmocom-list-commits.yml +++ b/jobs/osmocom-list-commits.yml @@ -26,7 +26,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 06b4ecb..ff2a18a 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -44,7 +44,7 @@ - git: branches: - '$BRANCH' - url: https://git.osmocom.org/osmo-ci + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' triggers: diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 9d644ec..e378122 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -61,7 +61,7 @@ description: | Version of the Osmocom stack to test against the kernel. Either <code>latest</code> for the latest release version, or - <code>master</code> for HEAD of git.osmocom.org. + <code>master</code> for HEAD of Osmocom git repositories. default: 'latest' - string: name: BRANCH diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fb2a6ec..17a0942 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -5,7 +5,7 @@ disabled: false description: | Run the a testsuite from - <a href="https://git.osmocom.org/docker-playground/"> + <a href="https://gitea.osmocom.org/osmocom/docker-playground"> docker-playground.git</a>.<br> If this job ends in <code>-latest</code>, the job runs the latest stable versions of the Osmocom stack. Otherwise the nightly builds.<br> diff --git a/scripts/common.sh b/scripts/common.sh index 227f965..788fbff 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -155,7 +155,7 @@ if [ -d "_docker_playground" ]; then git -C _docker_playground fetch else - git clone https://git.osmocom.org/docker-playground/ _docker_playground + git clone https://gerrit.osmocom.org/docker-playground/ _docker_playground fi cd _docker_playground diff --git a/scripts/osmo-build.sh b/scripts/osmo-build.sh index 8ca8e47..43413cf 100644 --- a/scripts/osmo-build.sh +++ b/scripts/osmo-build.sh @@ -172,7 +172,7 @@ branch_and_rev_of_remote_repo() { if [ -z "${2+x}" ]; then branch="master"; else branch="$2"; fi branch="$( echo "$branch" | tr '/' '_')" - rev="$(git ls-remote "https://git.osmocom.org/$1" "refs/heads/$branch")" + rev="$(git ls-remote "https://gerrit.osmocom.org/$1" "refs/heads/$branch")" # check whether branch is a tag if [ "$rev" = "" ]; then diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 28f0699..94a1cb5 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -2,7 +2,7 @@ # Copyright 2018 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> # Where to clone sources from (with trailing slash) -git_url_prefix = "https://git.osmocom.org/" +git_url_prefix = "https://gerrit.osmocom.org/" # Default projects to build when none are specified on the command line projects = ("osmo-bts", diff --git a/scripts/osmo-depcheck/dependencies.py b/scripts/osmo-depcheck/dependencies.py index 4e611ad..d2b9927 100644 --- a/scripts/osmo-depcheck/dependencies.py +++ b/scripts/osmo-depcheck/dependencies.py @@ -14,7 +14,7 @@ """ Clone a missing git repository and checkout a specific version tag. :param workdir: path to where all data (git, build, install) is stored - :param prefix: git url prefix (e.g. "https://git.osmocom.org/") + :param prefix: git url prefix (e.g. "https://gerrit.osmocom.org/") :param cache_git_fetch: list of repositories that have already been fetched in this run of osmo-depcheck :param repository: Osmocom git repository name (e.g. "libosmo-abis") @@ -56,7 +56,7 @@ repository, parsing the "configure.ac" file, and recursing. :param workdir: path to where all data (git, build, install) is stored - :param prefix: git url prefix (e.g. "https://git.osmocom.org/") + :param prefix: git url prefix (e.g. "https://gerrit.osmocom.org/") :param cache_git_fetch: list of repositories that have already been fetched in this run of osmo-depcheck :param initial: the first program to look at (e.g. "osmo-bts") diff --git a/scripts/osmo-layer1-headers.sh b/scripts/osmo-layer1-headers.sh index 19db1d7..b9c43c5 100755 --- a/scripts/osmo-layer1-headers.sh +++ b/scripts/osmo-layer1-headers.sh @@ -16,7 +16,7 @@ version="origin/master" ;; oct) - uri="https://git.osmocom.org/octphy-2g-headers" + uri="https://gitea.osmocom.org/cellular-infrastructure/octphy-2g-headers" version_prefix="" version="origin/master" ;; -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I90409c9e7f4db4e1765647021625f9acfccaa78b Gerrit-Change-Number: 29489 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: coverity/prepare_source_Osmocom: remove test -d

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29486 ) Change subject: coverity/prepare_source_Osmocom: remove test -d ...................................................................... coverity/prepare_source_Osmocom: remove test -d This was redundant, mkdir -p doesn't error if the directory structure exists. Change-Id: Ic6253ecb9bfd5f8b2d744988b8825ef90e2e6d5e --- M coverity/prepare_source_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 122fc1c..258dbb0 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -45,7 +45,7 @@ asn1c " -[ -d $BASEDIR ] || mkdir -p $BASEDIR +mkdir -p $BASEDIR cd $BASEDIR for proj in $PROJECTS $PROJECTS_DONT_BUILD_TEST; do -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic6253ecb9bfd5f8b2d744988b8825ef90e2e6d5e Gerrit-Change-Number: 29486 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: coverity: use osmo_git_clone_url

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29487 ) Change subject: coverity: use osmo_git_clone_url ...................................................................... coverity: use osmo_git_clone_url Stop cloning from git.osmocom.org by using the shared function. Change-Id: I17590d0b0b46274e2ceb007e20d7d1dc039f4e8d --- A coverity/common.sh M coverity/local_test.sh M coverity/prepare_source_Osmocom.sh 3 files changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/coverity/common.sh b/coverity/common.sh new file mode 120000 index 0000000..8f435c6 --- /dev/null +++ b/coverity/common.sh @@ -0,0 +1 @@ +../scripts/common.sh \ No newline at end of file diff --git a/coverity/local_test.sh b/coverity/local_test.sh index 4ac1307..dffb101 100755 --- a/coverity/local_test.sh +++ b/coverity/local_test.sh @@ -7,6 +7,7 @@ mkdir -p /tmp/coverity cp "$SCRIPT_DIR"/* /tmp/coverity +ln -sf "$SCRIPT_DIR/../scripts/common.sh" /tmp/coverity/common.sh cd /tmp/coverity diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 258dbb0..ad03835 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -1,4 +1,5 @@ #!/bin/sh +. $(realpath common.sh) BASEDIR=source-Osmocom # How to add a new project: @@ -57,7 +58,7 @@ git -C "$proj" clean -ffxd fi else - git clone https://git.osmocom.org/$proj + git clone "$(osmo_git_clone_url "$proj")" fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I17590d0b0b46274e2ceb007e20d7d1dc039f4e8d Gerrit-Change-Number: 29487 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: osmo_git_clone_url: git.osmocom.org -> gitea

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29485 ) Change subject: osmo_git_clone_url: git.osmocom.org -> gitea ...................................................................... osmo_git_clone_url: git.osmocom.org -> gitea Update the function to not use legacy URLs anymore and allow adding future gitea URLs more easily. Update the description of the function to reflect the new motivation for using this. Change-Id: Ibf53ca2c444fae82af73e417410faa5b16f5de59 --- M scripts/common.sh 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/common.sh b/scripts/common.sh index 23a3380..6d93cc8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,7 +1,7 @@ #!/bin/sh # Various functions and variables used in multiple osmo-ci shell scripts OSMO_CI_DIR="$(realpath "$(dirname "$0")/..")" -OSMO_GIT_URL="https://git.osmocom.org" +OSMO_GIT_URL_GITEA="https://gitea.osmocom.org" OSMO_GIT_URL_GERRIT="https://gerrit.osmocom.org" # Osmocom repositories of which we want to build release tarballs automatically, and list the current versions at @@ -120,13 +120,18 @@ fi } -# Print git clone URL for an Osmocom git repository. Prefer the gerrit clone URL, because cloning from the regular URL -# sometimes results in the "garbage at end of loose object" error (OS#4083). +# Echo git clone URL for an Osmocom git repository. For projects developed on +# gerrit, use the gerrit URL to avoid the mirror sync delay, for other +# repositories use the gitea URL. +# https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure # $1: Osmocom project (e.g. "osmo-hlr") osmo_git_clone_url() { case "$1" in - rtl-sdr|osmo-fl2k|libosmo-dsp|libgtpnl|libasn1c|libusrp|libsmpp34) - echo "$OSMO_GIT_URL"/"$1" + libgtpnl|libasn1c|libsmpp34) + echo "$OSMO_GIT_URL_GITEA"/cellular-infrastructure/"$1" + ;; + rtl-sdr|osmo-fl2k|libosmo-dsp|libusrp) + echo "$OSMO_GIT_URL_GITEA"/sdr/"$1" ;; *) echo "$OSMO_GIT_URL_GERRIT"/"$1" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibf53ca2c444fae82af73e417410faa5b16f5de59 Gerrit-Change-Number: 29485 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ci[master]: coverity: use osmo_git_clone_url

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29487 ) Change subject: coverity: use osmo_git_clone_url ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I17590d0b0b46274e2ceb007e20d7d1dc039f4e8d Gerrit-Change-Number: 29487 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 12:06:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: cosmetic: osmux: Drop extra empty line

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29491 ) Change subject: cosmetic: osmux: Drop extra empty line ...................................................................... cosmetic: osmux: Drop extra empty line Change-Id: I679a62c49290dfeb9e2c63890daa67002bfe3339 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index ab49cd5..706de07 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -583,7 +583,6 @@ * \param[in] conn connection to disable */ void conn_osmux_disable(struct mgcp_conn_rtp *conn) { - OSMO_ASSERT(conn->osmux.state != OSMUX_STATE_DISABLED); LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I679a62c49290dfeb9e2c63890daa67002bfe3339 Gerrit-Change-Number: 29491 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Allocate rate counters during initialization of osmux conn

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29490 ) Change subject: osmux: Allocate rate counters during initialization of osmux conn ...................................................................... osmux: Allocate rate counters during initialization of osmux conn Let's not delay allocation of rate counters until the osmux conn is fully enabled, since we may want to count stuff before that point in time. Fixes crash accessing null conn->osmux.ctrg in MGCP_Test.TC_two_crcx_and_rtp_osmux_bidir. Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 --- M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 19 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index 58d9095..1da7c8b 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -14,6 +14,7 @@ struct mgcp_conn_rtp; int osmux_init(int role, struct mgcp_trunk *trunk); +int osmux_init_conn(struct mgcp_conn_rtp *conn); int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, const struct osmo_sockaddr *addr); void conn_osmux_disable(struct mgcp_conn_rtp *conn); diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 1f21888..ab49cd5 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -500,6 +500,19 @@ return 0; } +/*! Initialize Osmux bits of a conn. + * \param[in] conn Osmux connection to initialize + * \returns 0 on success, negative on ERROR */ +int osmux_init_conn(struct mgcp_conn_rtp *conn) +{ + if (conn_osmux_allocate_local_cid(conn) == -1) + return -1; + conn->osmux.ctrg = rate_ctr_group_alloc(conn->conn, &rate_ctr_group_osmux_desc, conn->ctrg->idx); + + conn->osmux.state = OSMUX_STATE_ACTIVATING; + return 0; +} + /*! enable OSXMUX circuit for a specified connection. * \param[in] endp mgcp endpoint (configuration) * \param[in] conn connection to disable @@ -561,8 +574,6 @@ osmux_xfrm_output_set_tx_cb(conn->osmux.out, scheduled_from_osmux_tx_rtp_cb, conn); - conn->osmux.ctrg = rate_ctr_group_alloc(conn->conn, &rate_ctr_group_osmux_desc, conn->ctrg->idx); - conn->osmux.state = OSMUX_STATE_ENABLED; return 0; @@ -591,11 +602,12 @@ osmux_handle_put(conn->osmux.in); conn->osmux.remote_cid = 0; conn->osmux.remote_cid_present = false; - - rate_ctr_group_free(conn->osmux.ctrg); - conn->osmux.ctrg = NULL; } + conn_osmux_release_local_cid(conn); + + rate_ctr_group_free(conn->osmux.ctrg); + conn->osmux.ctrg = NULL; } /*! relase OSXMUX cid, that had been allocated to this connection. diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index e748c5b..711ca31 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1003,8 +1003,7 @@ conn->osmux.state = OSMUX_STATE_DISABLED; /* If X-Osmux (remote CID) was received (-1 is wilcard), alloc next avail CID as local CID */ if (remote_osmux_cid >= -1) { - conn->osmux.state = OSMUX_STATE_ACTIVATING; - if (conn_osmux_allocate_local_cid(conn) == -1) { + if (osmux_init_conn(conn) < 0) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); goto error2; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 Gerrit-Change-Number: 29490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022