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

[M] Change in osmo-ttcn3-hacks[master]: testenv: install dbg pkgs with --binary-repo too

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38803?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: testenv: install dbg pkgs with --binary-repo too ...................................................................... testenv: install dbg pkgs with --binary-repo too When using --binary-repo, figure out the -dbg and -dbgsym packages for all dependencies of packages to be installed, and install them as well. This will make debug symbols available in jenkins, useful for the related issue. Before this patch debug symbols were only available when building locally without --binary-repo. Related: OS#6630 Change-Id: I4dc57257b944126fed2c7b031c92c77a3d4286e0 --- M _testenv/data/podman/Dockerfile M _testenv/testenv/podman_install.py 2 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/38803/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4dc57257b944126fed2c7b031c92c77a3d4286e0 Gerrit-Change-Number: 38803 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/registry-rebuild-upload-android: new job

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38800?usp=email ) Change subject: jobs/registry-rebuild-upload-android: new job ...................................................................... jobs/registry-rebuild-upload-android: new job Add a job to build and upload the debian-bookworm-android image, to be used for building the android-apdu-proxy app and possibly more in the future. Related: OS#6367 Depends: docker-playground Ic7a454be23072c3f0ed609d370fc88f49205b04c Change-Id: Ia71bf8df638b9c4359d8b1a723795029541e023a --- A jobs/registry-rebuild-upload.yml 1 file changed, 39 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/jobs/registry-rebuild-upload.yml b/jobs/registry-rebuild-upload.yml new file mode 100644 index 0000000..c5a094a --- /dev/null +++ b/jobs/registry-rebuild-upload.yml @@ -0,0 +1,39 @@ +- project: + name: registry-rebuild-upload + jobs: + - "{job-name}" + job-name: + - registry-rebuild-upload-android: + image: "debian-bookworm-android" + +- job-template: + name: '{job-name}' + description: | + Build the <code>{image}</code> image from + <a href="https://gitea.osmocom.org/osmocom/docker-playground/"> + docker-playground + </a> and push it to the Osmocom registry. + concurrent: false + parameters: + - string: + name: BRANCH + description: | + Branch of <code>docker-playground.git</code> + default: 'master' + scm: + - git: + url: https://gerrit.osmocom.org/docker-playground + skip-tag: true + branches: + - '$BRANCH' + builders: + - shell: | + REGISTRY="registry.osmocom.org" + make -C "{image}" REGISTRY_HOST=$REGISTRY + docker push "$REGISTRY/$USER/{image}" + properties: + - build-discarder: + num-to-keep: 120 + wrappers: + - ansicolor: + colormap: xterm -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38800?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia71bf8df638b9c4359d8b1a723795029541e023a Gerrit-Change-Number: 38800 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add android-apdu-proxy

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38801?usp=email ) Change subject: jobs/master-builds: add android-apdu-proxy ...................................................................... jobs/master-builds: add android-apdu-proxy Gradle downloads a lot of files during the build, mount the cache dirs so this is only done once for master builds. Related: OS#6367 Change-Id: Ie7c3948e8c4a1a75a1efaac3e7c238601c5cdccb --- M jobs/master-builds.yml 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index f711d4d..3896e67 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -67,6 +67,7 @@ -v "$CCACHE_DIR:/ccache" \ docker_img: '$USER/debian-bookworm-build' docker_img_erlang: '$USER/debian-bookworm-erlang' + docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: @@ -80,6 +81,19 @@ # in alphabetical order repos: + - android-apdu-proxy: + repos_url: '{gitea_url}/sim-card/android-apdu-proxy' + branch: master + cmd: | + ANDROID_CACHE="$HOME/android-cache/master-builds/android" + GRADLE_CACHE="$HOME/android-cache/master-builds/gradle" + mkdir -p "$ANDROID_CACHE" "$GRADLE_CACHE" + docker pull {docker_img_android} + {docker_run} \ + -v "$ANDROID_CACHE":/build/.android \ + -v "$GRADLE_CACHE":/build/.gradle \ + {docker_img_android} {timeout_cmd} contrib/jenkins.sh + - asn1c: branch: osmo-iuh/master -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38801?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie7c3948e8c4a1a75a1efaac3e7c238601c5cdccb Gerrit-Change-Number: 38801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: archive android-apdu-proxy apk

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38802?usp=email ) Change subject: jobs/master-builds: archive android-apdu-proxy apk ...................................................................... jobs/master-builds: archive android-apdu-proxy apk Store the apk after successful run of the android-apdu-proxy job. It can be found by clicking on a job at [1] and then clicking on "default" (since the job is behind a matrix, as all master jobs). [1]: https://jenkins.osmocom.org/jenkins/job/master-android-apdu-proxy/ Related: OS#6367 Change-Id: If3224da6c4e3fa90fa84abfec4e75efd634a8bfa --- M jobs/master-builds.yml 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3896e67..e37d1d2 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -78,6 +78,7 @@ branch: master ssh: - docs_ftp.osmocom.org + archive_artifacts_on_success: false # in alphabetical order repos: @@ -93,6 +94,7 @@ -v "$ANDROID_CACHE":/build/.android \ -v "$GRADLE_CACHE":/build/.gradle \ {docker_img_android} {timeout_cmd} contrib/jenkins.sh + archive_artifacts_on_success: true - asn1c: branch: osmo-iuh/master @@ -677,13 +679,15 @@ - shell: | # Remove workspace on success to free up space. Create an empty dir # so the job does not abort when attempting to collect artifacts. - rm -rf "$WORKSPACE" - mkdir -p "$WORKSPACE" + if [ "{archive_artifacts_on_success}" != "True" ]; then + rm -rf "$WORKSPACE" + mkdir -p "$WORKSPACE" + fi publishers: - archive: allow-empty: true - artifacts: '**/core, **/testsuite.log, **/workspace.tar.xz' + artifacts: '**/core, **/testsuite.log, **/workspace.tar.xz, **/app-release.apk' - warnings: console-log-parsers: - 'GNU C Compiler 4 (gcc)' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38802?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If3224da6c4e3fa90fa84abfec4e75efd634a8bfa Gerrit-Change-Number: 38802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: archive android-apdu-proxy apk

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38802?usp=email ) Change subject: jobs/master-builds: archive android-apdu-proxy apk ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38802?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: If3224da6c4e3fa90fa84abfec4e75efd634a8bfa Gerrit-Change-Number: 38802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 07:12:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add android-apdu-proxy

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38801?usp=email ) Change subject: jobs/master-builds: add android-apdu-proxy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38801?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: Ie7c3948e8c4a1a75a1efaac3e7c238601c5cdccb Gerrit-Change-Number: 38801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 07:12:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/registry-rebuild-upload-android: new job

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38800?usp=email ) Change subject: jobs/registry-rebuild-upload-android: new job ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38800?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: Ia71bf8df638b9c4359d8b1a723795029541e023a Gerrit-Change-Number: 38800 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 07:11:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-android: new container

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/38799?usp=email ) Change subject: debian-bookworm-android: new container ...................................................................... debian-bookworm-android: new container Add a container for building android-apdu-proxy and possibly more android projects in the future. Related: OS#6367 Change-Id: Ic7a454be23072c3f0ed609d370fc88f49205b04c --- A debian-bookworm-android/Dockerfile A debian-bookworm-android/Makefile 2 files changed, 27 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian-bookworm-android/Dockerfile b/debian-bookworm-android/Dockerfile new file mode 100644 index 0000000..da3154f --- /dev/null +++ b/debian-bookworm-android/Dockerfile @@ -0,0 +1,24 @@ +# Image for building Android apps (android-apdu-proxy) +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG UID + +RUN useradd --uid=${UID} -d /build -m build + +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + android-sdk \ + sdkmanager \ + && \ + apt-get clean + +ENV ANDROID_HOME=/usr/lib/android-sdk/ + +RUN set -x && \ + sdkmanager 'platforms;android-34' && \ + sdkmanager 'build-tools;34.0.0' && \ + yes | sdkmanager --licenses diff --git a/debian-bookworm-android/Makefile b/debian-bookworm-android/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-android/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38799?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic7a454be23072c3f0ed609d370fc88f49205b04c Gerrit-Change-Number: 38799 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in osmo-hlr[master]: change default reject cause to plmn-not-allowed

by falconia

Attention is currently required from: keith. falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38794?usp=email ) Change subject: change default reject cause to plmn-not-allowed ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38794?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icff1d19670c398b119ec68b1d5f0fad87b605702 Gerrit-Change-Number: 38794 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 19 Nov 2024 05:09:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

7 months, 1 week

1
0
0 0

[S] Change in osmo-hlr[master]: vty: always emit reject-cause lines in saved config

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38818?usp=email ) Change subject: vty: always emit reject-cause lines in saved config ...................................................................... vty: always emit reject-cause lines in saved config When reject-cause (not-found|no-proxy) setting was added, it was implemented such that the new setting is not written into saved config files if it equals the default of 'imsi-unknown'. Change this behavior to always write out the current setting for each of not-found and no-proxy, whether or not they match compiled-in defaults. Change-Id: I18708fc1c08a85e98582c97ec59dd3822a0767fb --- M src/hlr_vty.c M tests/test_nodes.vty 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/18/38818/1 diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 2c7cd5b..4694c44 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -320,14 +320,12 @@ { vty_out(vty, "hlr%s", VTY_NEWLINE); - if (g_hlr->reject_cause != GMM_CAUSE_IMSI_UNKNOWN) - vty_out(vty, " reject-cause not-found %s%s", - get_value_string_or_null(gsm48_gmm_cause_vty_names, - (uint32_t) g_hlr->reject_cause), VTY_NEWLINE); - if (g_hlr->no_proxy_reject_cause != GMM_CAUSE_IMSI_UNKNOWN) - vty_out(vty, " reject-cause no-proxy %s%s", - get_value_string_or_null(gsm48_gmm_cause_vty_names, - (uint32_t) g_hlr->no_proxy_reject_cause), VTY_NEWLINE); + vty_out(vty, " reject-cause not-found %s%s", + get_value_string_or_null(gsm48_gmm_cause_vty_names, + (uint32_t) g_hlr->reject_cause), VTY_NEWLINE); + vty_out(vty, " reject-cause no-proxy %s%s", + get_value_string_or_null(gsm48_gmm_cause_vty_names, + (uint32_t) g_hlr->no_proxy_reject_cause), VTY_NEWLINE); if (g_hlr->store_imei) vty_out(vty, " store-imei%s", VTY_NEWLINE); if (g_hlr->db_file_path && strcmp(g_hlr->db_file_path, HLR_DEFAULT_DB_FILE_PATH)) diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 6875416..516360f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -113,6 +113,8 @@ logging level dgsm notice ... hlr + reject-cause not-found imsi-unknown + reject-cause no-proxy imsi-unknown store-imei database hlr_vty_test.db no subscriber-create-on-demand -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38818?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I18708fc1c08a85e98582c97ec59dd3822a0767fb Gerrit-Change-Number: 38818 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024