lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

August 2025

  • 1 participants
  • 1086 discussions
[XS] Change in pysim[master]: requirements: set cmd2>=2.6.2,<3.0
by fixeria 27 Aug '25

27 Aug '25
Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/pysim/+/40952?usp=email ) Change subject: requirements: set cmd2>=2.6.2,<3.0 ...................................................................... Patch Set 1: (1 comment) File requirements.txt: https://gerrit.osmocom.org/c/pysim/+/40952/comment/73e6eea7_647aa32d?usp=em… : PS1, Line 4: cmd2>=2.6.2,<3.0 I am not sure if it's a good idea to set `<3.0` here. This is only relevant for building documentation, running with cmd2 should still be possible, right? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40952?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: I4ba65ed486247c5670313b75f43a242d264df14b Gerrit-Change-Number: 40952 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 12:55:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No
1 0
0 0
[M] Change in osmo-sgsn[master]: Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h}
by osmith 27 Aug '25

27 Aug '25
Attention is currently required from: fixeria, lynxis lazus, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40954?usp=email ) Change subject: Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h} ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40954?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I09c19689fd7016b76ebeee821b551427965b7cf1 Gerrit-Change-Number: 40954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 27 Aug 2025 12:50:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[XS] Change in pysim[master]: docs: fix authors line exceeding the page
by fixeria 27 Aug '25

27 Aug '25
Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/pysim/+/40953?usp=email ) Change subject: docs: fix authors line exceeding the page ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40953?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: Iacbba6c2f74bf2b9f96057e71bde017a11f703a8 Gerrit-Change-Number: 40953 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Aug 2025 12:49:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes
1 0
0 0
[M] Change in osmo-sgsn[master]: Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h}
by pespin 27 Aug '25

27 Aug '25
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40954?usp=email ) Change subject: Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h} ...................................................................... Move gsm0408_gprs_rcvmsg_iu to gprs_gmm.{c,h} It belongs to that layer, same as existing gsm0408_gprs_rcvmsg_gb() counterpart. Change-Id: I09c19689fd7016b76ebeee821b551427965b7cf1 --- M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_ranap.h M src/sgsn/gprs_gmm.c M src/sgsn/gprs_ranap.c 4 files changed, 46 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/54/40954/1 diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 900ad6a..3b36ccd 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -2,6 +2,7 @@ #define _GPRS_GMM_H #include <stdbool.h> +#include <stdint.h> #include <osmocom/core/msgb.h> #include <osmocom/gsm/gsm48.h> @@ -35,6 +36,10 @@ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable); +#ifdef BUILD_IU +int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, uint16_t *sai); +#endif /* ifdef BUILD_IU */ + /* Has to be called whenever any PDU (signaling, data, ...) has been received */ void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg); diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index 6dcb63a..b75bba2 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -21,8 +21,6 @@ void sgsn_ranap_iu_release_free(struct sgsn_mm_ctx *ctx, const struct RANAP_Cause *cause); -int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, uint16_t *sai); - #else /* ifndef BUILD_IU */ inline static void sgsn_ranap_iu_free(void *ctx) {}; inline static void sgsn_ranap_iu_release_free(void *ctx, void *cause) {}; diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 4c32fd8..d2627a3 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -2379,3 +2379,44 @@ return rc; } + +#ifdef BUILD_IU +/* Main entry point for incoming 04.08 GPRS messages from Iu */ +int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, + uint16_t *sai) +{ + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); + uint8_t pdisc = gsm48_hdr_pdisc(gh); + struct sgsn_mm_ctx *mmctx; + int rc = -EINVAL; + + mmctx = sgsn_mm_ctx_by_ue_ctx(MSG_IU_UE_CTX(msg)); + if (mmctx) { + rate_ctr_inc(rate_ctr_group_get_ctr(mmctx->ctrg, GMM_CTR_PKTS_SIG_IN)); + if (ra_id) + memcpy(&mmctx->ra, ra_id, sizeof(mmctx->ra)); + } + + /* MMCTX can be NULL */ + + switch (pdisc) { + case GSM48_PDISC_MM_GPRS: + rc = gsm0408_rcv_gmm(mmctx, msg, NULL, false); +#pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" + break; + case GSM48_PDISC_SM_GPRS: + rc = gsm0408_rcv_gsm(mmctx, msg, NULL); + break; + default: + LOGMMCTXP(LOGL_NOTICE, mmctx, + "Unknown GSM 04.08 discriminator 0x%02x: %s\n", + pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); + /* FIXME: return status message */ + break; + } + + /* MMCTX can be invalid */ + + return rc; +} +#endif /* ifdef BUILD_IU */ diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 08fc625..a7f8c5a 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -281,43 +281,3 @@ msg->l2h = msg->data; return ranap_iu_rab_act(uectx, msg); } - - -/* Main entry point for incoming 04.08 GPRS messages from Iu */ -int gsm0408_gprs_rcvmsg_iu(struct msgb *msg, struct gprs_ra_id *ra_id, - uint16_t *sai) -{ - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); - uint8_t pdisc = gsm48_hdr_pdisc(gh); - struct sgsn_mm_ctx *mmctx; - int rc = -EINVAL; - - mmctx = sgsn_mm_ctx_by_ue_ctx(MSG_IU_UE_CTX(msg)); - if (mmctx) { - rate_ctr_inc(rate_ctr_group_get_ctr(mmctx->ctrg, GMM_CTR_PKTS_SIG_IN)); - if (ra_id) - memcpy(&mmctx->ra, ra_id, sizeof(mmctx->ra)); - } - - /* MMCTX can be NULL */ - - switch (pdisc) { - case GSM48_PDISC_MM_GPRS: - rc = gsm0408_rcv_gmm(mmctx, msg, NULL, false); -#pragma message "set drop_cipherable arg for gsm0408_rcv_gmm() from IuPS?" - break; - case GSM48_PDISC_SM_GPRS: - rc = gsm0408_rcv_gsm(mmctx, msg, NULL); - break; - default: - LOGMMCTXP(LOGL_NOTICE, mmctx, - "Unknown GSM 04.08 discriminator 0x%02x: %s\n", - pdisc, osmo_hexdump((uint8_t *)gh, msgb_l3len(msg))); - /* FIXME: return status message */ - break; - } - - /* MMCTX can be invalid */ - - return rc; -} -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40954?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I09c19689fd7016b76ebeee821b551427965b7cf1 Gerrit-Change-Number: 40954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>
1 0
0 0
[XS] Change in pysim[master]: docs: fix authors line exceeding the page
by osmith 27 Aug '25

27 Aug '25
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40953?usp=email ) Change subject: docs: fix authors line exceeding the page ...................................................................... docs: fix authors line exceeding the page Fix that the authors get cut off as they exceed the page in the PDF version. This can currently be seen here: https://downloads.osmocom.org/docs/pysim/master/osmopysim-usermanual.pdf Change-Id: Iacbba6c2f74bf2b9f96057e71bde017a11f703a8 --- M docs/conf.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/40953/1 diff --git a/docs/conf.py b/docs/conf.py index 8455007..9091878 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,6 +21,14 @@ copyright = '2009-2023 by Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle, Merlin Chlosta' author = 'Sylvain Munaut, Harald Welte, Philipp Maier, Supreeth Herle, Merlin Chlosta' +# PDF: Avoid that the authors list exceeds the page by inserting '\and' +# manually as line break (https://github.com/sphinx-doc/sphinx/issues/6875) +latex_elements = { + "maketitle": + r"""\author{Sylvain Munaut, Harald Welte, Philipp Maier, \and Supreeth Herle, Merlin Chlosta} +\sphinxmaketitle +""" +} # -- General configuration --------------------------------------------------- -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iacbba6c2f74bf2b9f96057e71bde017a11f703a8 Gerrit-Change-Number: 40953 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>
1 0
0 0
[XS] Change in pysim[master]: requirements: set cmd2>=2.6.2,<3.0
by osmith 27 Aug '25

27 Aug '25
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/40952?usp=email ) Change subject: requirements: set cmd2>=2.6.2,<3.0 ...................................................................... requirements: set cmd2>=2.6.2,<3.0 Remove the previous workaround that set cmd2==2.4.3 in jenkins.sh. The bug this worked around has been fixed in 2.6.2. 3.0 will break unless we use some new additional decorator. Related: OS#6776 Change-Id: I4ba65ed486247c5670313b75f43a242d264df14b --- M contrib/jenkins.sh M requirements.txt 2 files changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/40952/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 63087f0..de1d9f8 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -82,10 +82,6 @@ pip install -r requirements.txt - # XXX: workaround for https://github.com/python-cmd2/cmd2/issues/1414 - # 2.4.3 was the last stable release not affected by this bug (OS#6776) - pip install cmd2==2.4.3 - rm -rf docs/_build make -C "docs" html latexpdf diff --git a/requirements.txt b/requirements.txt index 9749d7f..056d912 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pyscard pyserial pytlv -cmd2>=1.5 +cmd2>=2.6.2,<3.0 jsonpath-ng construct>=2.10.70 bidict -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40952?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4ba65ed486247c5670313b75f43a242d264df14b Gerrit-Change-Number: 40952 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>
1 0
0 0
[XS] Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: use trixie
by osmith 27 Aug '25

27 Aug '25
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40950?usp=email ) Change subject: jobs/registry-rebuild-upload-titan: use trixie ...................................................................... jobs/registry-rebuild-upload-titan: use trixie Switch to the latest Debian release. Depends: osmo-ttcn3-hacks Ib62851960724c17f9adddf54a2fc39adef911d32 Related: OS#6826 Change-Id: Iecca98c88ca81f192b7ffb01314654e1aa5cdb8b --- M jobs/registry-rebuild-upload-titan.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/registry-rebuild-upload-titan.yml b/jobs/registry-rebuild-upload-titan.yml index 3b0b778..64d7619 100644 --- a/jobs/registry-rebuild-upload-titan.yml +++ b/jobs/registry-rebuild-upload-titan.yml @@ -92,7 +92,7 @@ builders: - shell: | REGISTRY="registry.osmocom.org" - DISTRO="debian:bookworm" + DISTRO="debian:trixie" IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" podman build \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40950?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: Iecca98c88ca81f192b7ffb01314654e1aa5cdb8b Gerrit-Change-Number: 40950 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>
1 0
0 0
[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: pull trixie image
by osmith 27 Aug '25

27 Aug '25
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40951?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: pull trixie image ...................................................................... jobs/ttcn3-testsuites-testenv: pull trixie image Change-Id: Id6502c8fdad17feca9e3bc22f8b80d238fad9a8d --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 542dcf4..4140ddd 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -592,7 +592,7 @@ which-build: last-successful stable: true - shell: |- - DISTRO="debian:bookworm" + DISTRO="debian:trixie" IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" KERNEL="{kernel}" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40951?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: Id6502c8fdad17feca9e3bc22f8b80d238fad9a8d Gerrit-Change-Number: 40951 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>
1 0
0 0
[XS] Change in osmo-ttcn3-hacks[master]: testenv: add debian:trixie
by osmith 27 Aug '25

27 Aug '25
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40947?usp=email ) Change subject: testenv: add debian:trixie ...................................................................... testenv: add debian:trixie Change-Id: Ib62851960724c17f9adddf54a2fc39adef911d32 --- M _testenv/testenv/__init__.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index f0d6629..f23f1f6 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -25,6 +25,7 @@ # from the binary repository distros_repodirs = { "debian:bookworm": "Debian_12", + "debian:trixie": "Debian_13", } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40947?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib62851960724c17f9adddf54a2fc39adef911d32 Gerrit-Change-Number: 40947 Gerrit-PatchSet: 2 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>
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: testenv: enable_binary_repo: configure apt pin
by osmith 27 Aug '25

27 Aug '25
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email ) Change subject: testenv: enable_binary_repo: configure apt pin ...................................................................... testenv: enable_binary_repo: configure apt pin Add an apt-pin to ensure packages from the Osmocom repositories get preferred over Debian's packages. I just ran into this with osmo-mgw, where we have 1.4.0 in osmocom:latest and Debian 13 has 1.14.0+dfsg1-2, which counts as higher version. This results in the wrong package being selected, and also in an error later on when trying to install related debug packages from our repository: The following packages have unmet dependencies: osmo-mgw-dbgsym : Depends: osmo-mgw (= 1.14.0) but 1.14.0+dfsg1-2 is to be installed Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4 --- M _testenv/testenv/podman.py 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index bc45b3a..678a0c1 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -301,16 +301,23 @@ def enable_binary_repo(): + # Add the binary repository config = "deb [signed-by=/obs.key]" config += " https://downloads.osmocom.org/packages/" config += testenv.args.binary_repo.replace(":", ":/") config += "/" config += testenv.distros_repodirs[distro] config += "/ ./" - path = "/etc/apt/sources.list.d/osmocom.list" - exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"]) + + # Add an apt-pin to prefer its packages + config = "Package: *\n" + config += 'Pin: origin "downloads.osmocom.org"\n' + config += "Pin-Priority: 1100\n" + path = "/etc/apt/preferences.d/osmocom-apt-pin" + exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"]) + exec_cmd(["apt-get", "-q", "update"]) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4 Gerrit-Change-Number: 40948 Gerrit-PatchSet: 2 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>
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • ...
  • 109
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.