November 2024 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim-shell: change Prompt character to "#" after "verify_adm"

by laforge

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38884?usp=email ) Change subject: pySim-shell: change Prompt character to "#" after "verify_adm" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f Gerrit-Change-Number: 38884 Gerrit-PatchSet: 3 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:49:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: reset card in method equip

by laforge

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38962?usp=email ) Change subject: pySim-shell: reset card in method equip ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38962?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I622a2df2c9184841f72abd18483bfbfd00b2f464 Gerrit-Change-Number: 38962 Gerrit-PatchSet: 2 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:49:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-ns-test{,-sns}: tweak timer

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38971?usp=email ) Change subject: jobs/ttcn3-ns-test{,-sns}: tweak timer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38971?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f61013661d5de5382c3431650051989200fd785 Gerrit-Change-Number: 38971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:48:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Allow null ptr in destroy() functions

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38972?usp=email ) Change subject: stream: Allow null ptr in destroy() functions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38972?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I99e23db6617af8261b512efffc62336b63b38516 Gerrit-Change-Number: 38972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:47:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-cbc[master]: .gitignore: Add install-sh~

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-cbc/+/38973?usp=email ) Change subject: .gitignore: Add install-sh~ ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: you could also add *~ as those are always some weird emacs-style backup files... -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/38973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Iad7ce44a2ecd90116376a458cc40f355d3883c53 Gerrit-Change-Number: 38973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:47:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/osmocom-release-android-apks: new job

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38974?usp=email ) Change subject: jobs/osmocom-release-android-apks: new job ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab3472c8bf24a35c5f602b03a29510542e2c3d58 Gerrit-Change-Number: 38974 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:46:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/osmocom-release-android-apks: new job

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38974?usp=email ) Change subject: jobs/osmocom-release-android-apks: new job ...................................................................... jobs/osmocom-release-android-apks: new job Add a job similar to the release tarballs job, that iterates over the tags of the android app repositories (currently only android-apdu-proxy) and builds/uploads an apk for each of them. Related: SYS#7197 Change-Id: Iab3472c8bf24a35c5f602b03a29510542e2c3d58 --- M .gitignore A jobs/osmocom-release-android-apks.yml A scripts/android/publish-apks-for-tags.sh 3 files changed, 208 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/38974/1 diff --git a/.gitignore b/.gitignore index 5f47674..6e99147 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ _release_tarballs/ _docker_playground _repo_install_test_data/ +_temp_apks/ _temp_manuals/ _temp_releases/ scripts/repo-install-test/run-inside-env.sh diff --git a/jobs/osmocom-release-android-apks.yml b/jobs/osmocom-release-android-apks.yml new file mode 100644 index 0000000..60b94ba --- /dev/null +++ b/jobs/osmocom-release-android-apks.yml @@ -0,0 +1,44 @@ +--- +- job: + name: 'Osmocom-release-android-apks' + node: osmocom-master + project-type: freestyle + defaults: global + description: | + Build and upload Android apks signed with a test key, to be later + re-signed with a proper key (SYS#7197). + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 30 + parameters: + - string: + name: BRANCH_OSMO_CI + description: | + osmo-ci.git branch with scripts/android/publish-apks-for-tags.sh + default: 'master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed build notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' + builders: + - shell: | + JENKINS=1 scripts/android/publish-apks-for-tags.sh + scm: + - git: + branches: + - '$BRANCH_OSMO_CI' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + wipe-workspace: true + triggers: + - timed: "H 05 * * *" + publishers: + - email: + notify-every-unstable-build: true + recipients: '$EMAIL_NOTIFICATIONS' + wrappers: + - ssh-agent-credentials: + users: + - binaries_ftp.osmocom.org diff --git a/scripts/android/publish-apks-for-tags.sh b/scripts/android/publish-apks-for-tags.sh new file mode 100755 index 0000000..b0ddeed --- /dev/null +++ b/scripts/android/publish-apks-for-tags.sh @@ -0,0 +1,163 @@ +#!/bin/sh -e +# Publish Android apks for tags, signed with a test key (to be re-signed with a +# proper key later on, see SYS#7197). + +. "$(dirname "$0")/../common.sh" +OSMO_CI_DIR="$(realpath $(dirname "$0")/../..)" +TEMP="$OSMO_CI_DIR/_temp_apks" +WEB_PATH="/downloads/home/binaries/web-files/android/.apks_testsig" +SSH_COMMAND="ssh -o UserKnownHostsFile=$OSMO_CI_DIR/contrib/known_hosts -p 48" +DOCKER_IMAGE="$USER/debian-bookworm-android" +LOG_PREFIX="::" + +OSMO_RELEASE_REPOS=" + android-apdu-proxy +" + +if [ "$JENKINS" = 1 ]; then + DOCKER_IMAGE="registry.osmocom.org/$DOCKER_IMAGE" +fi + +mkdir -p \ + "$TEMP" \ + "$TEMP/src" + +check_ssh_auth_sock() { + if [ -z "$SSH_AUTH_SOCK" ]; then + echo "ERROR: SSH_AUTH_SOCK is not set" + exit 1 + fi +} + +# $1: path on server, e.g. "/releases/osmo-bsc" +get_server_ls() { + local dir="$1" + local out="$TEMP/ls$(echo "$dir" | tr / _)" + + echo "$LOG_PREFIX Listing files on server: $dir" + + if [ -e "$out" ]; then + echo "Skipped, file exists: $out" + return + fi + + $SSH_COMMAND binaries(a)ftp.osmocom.org "ls -1 "$WEB_PATH$dir"" >"$out" +} + +# $1: repository +get_git_tags() { + local repo="$1" + local out="$TEMP/git_tags_$repo" + + echo "$LOG_PREFIX Getting git tags" + + if [ -e "$out" ]; then + echo "Skipped, file exists: $out" + return + fi + + osmo_git_last_tags "$repo" "all" >"$out" +} + +# $1: repository +# $2: tag +apk_exists() { + local repo="$1" + local tag="$2" + + grep -q "^$repo-$tag\.apk" "$TEMP"/ls_"$repo" +} + +# $1: repository +# $2: tag +clone_repo() { + local repo="$1" + local tag="$2" + local gitdir="$TEMP/src/$repo" + + if ! [ -d "$gitdir" ]; then + local url="$(osmo_git_clone_url "$repo")" + echo "$LOG_PREFIX Cloning $url" + git -C "$TEMP/src" clone "$url" "$repo" + fi + + echo "$LOG_PREFIX Checkout $tag" + cd "$gitdir" + git reset --hard HEAD + git checkout "$tag" + git submodule update --init + git clean -dxf +} + +build_apk() { + local repo="$1" + local tag="$2" + local gitdir="$TEMP/src/$repo" + + cd "$gitdir" + + echo "$LOG_PREFIX Building $repo-$tag.apk" + + ANDROID_CACHE="$HOME/android-cache/master-builds/android" + GRADLE_CACHE="$HOME/android-cache/master-builds/gradle" + mkdir -p "$ANDROID_CACHE" "$GRADLE_CACHE" + + if [ "$JENKINS" = 1 ]; then + docker pull "$DOCKER_IMAGE" + fi + + docker run --rm=true \ + -e HOME=/build \ + -i \ + -u build \ + -v "$ANDROID_CACHE":/build/.android \ + -v "$GRADLE_CACHE":/build/.gradle \ + -v "$PWD:/build" \ + -w /build \ + "$DOCKER_IMAGE" \ + timeout 60m contrib/jenkins.sh +} + +publish_apk() { + local repo="$1" + local tag="$2" + local apk_path_local="$TEMP/src/$repo/app/build/outputs/apk/release/app-release.apk" + + echo "$LOG_PREFIX Publishing $repo-$tag.apk" + + $SSH_COMMAND binaries(a)ftp.osmocom.org -- mkdir -p "$WEB_PATH/$repo" + rsync \ + -vz \ + -e "$SSH_COMMAND" \ + "$apk_path_local" \ + "binaries@ftp.osmocom.org:$WEB_PATH/$repo/$repo-$tag.apk" +} + +check_ssh_auth_sock +get_server_ls "/" + +for repo in $OSMO_RELEASE_REPOS; do + LOG_PREFIX=":: ($repo)" + + if grep -q "^$repo$" "$TEMP/ls_"; then + get_server_ls "/$repo" + else + echo "$LOG_PREFIX No release directory on server" + touch "$TEMP/ls_$repo" + fi + + get_git_tags "$repo" + + echo "$LOG_PREFIX Building missing apks" + for tag in $(cat "$TEMP"/git_tags_"$repo"); do + LOG_PREFIX=":: ($repo, $tag)" + if apk_exists "$repo" "$tag"; then + echo "$LOG_PREFIX Skipping, apk exists" + continue + fi + + clone_repo "$repo" "$tag" + build_apk "$repo" "$tag" + publish_apk "$repo" "$tag" + done +done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab3472c8bf24a35c5f602b03a29510542e2c3d58 Gerrit-Change-Number: 38974 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-cbc[master]: .gitignore: Add install-sh~

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/38973?usp=email ) Change subject: .gitignore: Add install-sh~ ...................................................................... .gitignore: Add install-sh~ Change-Id: Iad7ce44a2ecd90116376a458cc40f355d3883c53 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/73/38973/1 diff --git a/.gitignore b/.gitignore index 1872058..5a68e22 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ missing stamp-h1 configure~ +install-sh~ # libtool ltmain.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/38973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Iad7ce44a2ecd90116376a458cc40f355d3883c53 Gerrit-Change-Number: 38973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Allow null ptr in destroy() functions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38972?usp=email ) Change subject: stream: Allow null ptr in destroy() functions ...................................................................... stream: Allow null ptr in destroy() functions It's common pattern that free/destroy functions allow NULL pointers. Let's accept it here to make life easier for users. Change-Id: I99e23db6617af8261b512efffc62336b63b38516 --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/72/38972/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index a00f32a..89681b0 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -962,6 +962,9 @@ * \param[in] cli Stream Client to destroy */ void osmo_stream_cli_destroy(struct osmo_stream_cli *cli) { + if (!cli) + return; + LOGSCLI(cli, LOGL_DEBUG, "destroy()\n"); OSMO_ASSERT(!stream_cli_close(cli)); osmo_timer_del(&cli->timer); diff --git a/src/stream_srv.c b/src/stream_srv.c index 4f9323b..c74f7b0 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -510,6 +510,8 @@ * \param[in] link Stream Server Link */ void osmo_stream_srv_link_destroy(struct osmo_stream_srv_link *link) { + if (!link) + return; osmo_stream_srv_link_close(link); talloc_free(link); } @@ -1140,6 +1142,9 @@ * \param[in] conn Stream Server to be destroyed */ void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) { + if (!conn) + return; + switch (conn->mode) { case OSMO_STREAM_MODE_OSMO_FD: osmo_fd_unregister(&conn->ofd); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38972?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I99e23db6617af8261b512efffc62336b63b38516 Gerrit-Change-Number: 38972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in libasn1c[master]: debian/control: Build-Depends: add pkg-config

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libasn1c/+/38970?usp=email ) Change subject: debian/control: Build-Depends: add pkg-config ...................................................................... debian/control: Build-Depends: add pkg-config In Debian Unstable libtalloc-dev 2.4.2-2 does not depend on pkg-config anymore [1]. Since this change libasn1c fails to build with: [ 153s] ./configure: line 12856: syntax error near unexpected token `LIBTALLOC,' [ 153s] ./configure: line 12856: `PKG_CHECK_MODULES(LIBTALLOC, talloc)' Fix it by adding pkg-config to Build-Depends. [1]: https://salsa.debian.org/samba-team/talloc/-/commit/8bebb86a9f0b4487149b0c5… "d/control: drop pkg-config dependency for libtalloc-dev " Change-Id: I5b26c8c81b9e94f1af11294d4fac0194f9a21aa8 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 49cac89..d67abb8 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> Build-Depends: debhelper (>= 10), dh-autoreconf, + pkg-config, libtalloc-dev Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libasn1c.git -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/38970?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I5b26c8c81b9e94f1af11294d4fac0194f9a21aa8 Gerrit-Change-Number: 38970 Gerrit-PatchSet: 1 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>

6 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024