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

[M] Change in osmo-trx[master]: contrib/jenkins: remove broken chroot + qemu code

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-trx/+/38114?usp=email ) Change subject: contrib/jenkins: remove broken chroot + qemu code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/38114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2e204e4a0a7dfcf32f011ed6fb403b564f8155a7 Gerrit-Change-Number: 38114 Gerrit-PatchSet: 2 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, 12 Sep 2024 11:34:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: ansible: update rpi4-2 and rpi4-3

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38115?usp=email ) Change subject: ansible: update rpi4-2 and rpi4-3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38115?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: I959a564bb597f433012a14ce56da4865d3392170 Gerrit-Change-Number: 38115 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, 12 Sep 2024 11:33:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: utils: support alpha identifier in enc/dec_msisdn

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38118?usp=email ) Change subject: utils: support alpha identifier in enc/dec_msisdn ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: do we really want to continue to use those functions if we have proper construct encoder/decoder in place, which handle all scenarios? I'd rathe say as soon as we've converted all users, we shoul remove {enc,dec}_msisdn? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38118?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: I19ec8ba14551ec282fc0cc12ae2f6d528bdfc527 Gerrit-Change-Number: 38118 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Sep 2024 11:33:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38117?usp=email ) Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I think this is incompatible with earlier versions of pySim, right? So if somebody has existing scripts to update the MSISDN, it would not work with the new format. I know we did that quite a bit in the early development of pySim-shell days, but today I would say we have many more users and existing manuals / documentations / scripts / ... At the same time we don't want to prevent improvements. The best is probably to start some kind of changelog where we document incompatible changes. Alternatively, at least in this case, we could add some kind of compatibility wrapper. if the caller provides a dict with 'msisdn' as key, we know it's the old format and we could convert that to the new json format before calling the encoder? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?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: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Sep 2024 11:32:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: libosmo-sccp -> libosmo-sigtran

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38116?usp=email ) Change subject: libosmo-sccp -> libosmo-sigtran ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38116?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: I509b1cc2a5260c82ef32e9543513110949311188 Gerrit-Change-Number: 38116 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, 12 Sep 2024 11:25:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38117?usp=email ) Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... ts_51_011: replace encoding of EF.MSISDN with construct model The encoding of EF.MSISDN is currently done with enc_msisdn and dec_msisdn from utils.py. Let's replace this with a construct based model, similar to the one we already use with EF.ADN Related: OS#5714 Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a --- M pySim/ts_51_011.py 1 file changed, 16 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/17/38117/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index c6720fe..401db9e 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -190,20 +190,24 @@ # TS 51.011 Section 10.5.5 class EF_MSISDN(LinFixedEF): + _test_decode = [ + ( 'ffffffffffffffffffffffffffffffffffffffff04b12143f5ffffffffffffffffff', + {"alpha_id": "", "len_of_bcd": 4, "ton_npi": {"ext": True, "type_of_number": "network_specific", + "numbering_plan_id": "isdn_e164"}, + "dialing_nr": "12345f"}), + ( '456967656e65205275666e756d6d6572ffffffff0891947172199181f3ffffffffff', + {"alpha_id": "Eigene Rufnummer", "len_of_bcd": 8, "ton_npi": {"ext": True, "type_of_number": "international", + "numbering_plan_id": "isdn_e164"}, + "dialing_nr": "4917279119183f"}), + ] + _test_no_pad = True + def __init__(self, fid='6f40', sfid=None, name='EF.MSISDN', desc='MSISDN', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(15, 34), leftpad=True, **kwargs) - - def _decode_record_hex(self, raw_hex_data, **kwargs): - return {'msisdn': dec_msisdn(raw_hex_data)} - - def _encode_record_hex(self, abstract, **kwargs): - msisdn = abstract['msisdn'] - if type(msisdn) == str: - encoded_msisdn = enc_msisdn(msisdn) - else: - encoded_msisdn = enc_msisdn(msisdn[2], msisdn[0], msisdn[1]) - alpha_identifier = (list(self.rec_len)[0] - len(encoded_msisdn) // 2) * "ff" - return alpha_identifier + encoded_msisdn + self._construct = Struct('alpha_id'/COptional(GsmOrUcs2Adapter(Rpad(Bytes(this._.total_len-14)))), + 'len_of_bcd'/Int8ub, + 'ton_npi'/TonNpi, + 'dialing_nr'/ExtendedBcdAdapter(BcdAdapter(Rpad(Bytes(10))))) # TS 51.011 Section 10.5.6 class EF_SMSP(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?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: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: utils: support alpha identifier in enc/dec_msisdn

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38118?usp=email ) Change subject: utils: support alpha identifier in enc/dec_msisdn ...................................................................... utils: support alpha identifier in enc/dec_msisdn The functions enc_msisdn and dec_msisdn do not support encoding and decoding of the alpha identifier. Let's extend the functions accordingly. Related: OS#5714 Change-Id: I19ec8ba14551ec282fc0cc12ae2f6d528bdfc527 --- M pySim-read.py M pySim/utils.py M tests/unittests/test_utils.py 3 files changed, 33 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/38118/1 diff --git a/pySim-read.py b/pySim-read.py index aae5ad4..7af40b2 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -209,7 +209,7 @@ if sw == '9000': # (npi, ton, msisdn) = res if res is not None: - print("MSISDN (NPI=%d ToN=%d): %s" % res) + print("MSISDN (Alpha-Identifier=\"%s\" NPI=%d ToN=%d): %s" % res) else: print("MSISDN: Not available") else: diff --git a/pySim/utils.py b/pySim/utils.py index 05ad962..aa69a18 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -355,8 +355,9 @@ if len(ef_msisdn) < 14: raise ValueError("EF.MSISDN is too short") - # Skip optional Alpha Identifier + # Decode and skip optional Alpha Identifier xlen = len(ef_msisdn) - 14 + alpha_id = h2s(b2h(ef_msisdn[0:xlen])) msisdn_lhv = ef_msisdn[xlen:] # Parse the length (in bytes) of the BCD encoded number @@ -382,23 +383,28 @@ if ton == 0x01: msisdn = '+' + msisdn - return (npi, ton, msisdn) + return (alpha_id, npi, ton, msisdn) -def enc_msisdn(msisdn: str, npi: int = 0x01, ton: int = 0x03) -> Hexstr: +def enc_msisdn(msisdn: str, npi: int = 0x01, ton: int = 0x03, alpha_id: str = "", rec_len: int = 14) -> Hexstr: """ Encode MSISDN as LHV so it can be stored to EF.MSISDN. - See 3GPP TS 31.102, section 4.2.26 and 4.4.2.3. (The result - will not contain the optional Alpha Identifier at the beginning.) + See 3GPP TS 31.102, section 4.2.26 and 4.4.2.3. Default NPI / ToN values: - NPI: ISDN / telephony numbering plan (E.164 / E.163), - ToN: network specific or international number (if starts with '+'). + - alpha_id: human readable string that serves a label for the MSISDN + - rec_len: overall record length of the encoded result (>= 14) """ - # If no MSISDN is supplied then encode the file contents as all "ff" + # The resulting record length must have a length of at least 14 bytes. + if rec_len < 14: + raise ValueError("record length must be at least 14 bytess") + + # If no MSISDN is supplied then encode the record contents as all "ff" if msisdn in ["", "+"]: - return "ff" * 14 + return "ff" * rec_len # Leading '+' indicates International Number if msisdn[0] == '+': @@ -418,7 +424,14 @@ npi_ton = (npi & 0x0f) | ((ton & 0x07) << 4) | 0x80 bcd = rpad(swap_nibbles(msisdn), 10 * 2) # pad to 10 octets - return ('%02x' % bcd_len) + ('%02x' % npi_ton) + bcd + ("ff" * 2) + # Encode Alpha identifier + alpha_id_enc = s2h(alpha_id) + alpha_id_padding_len = rec_len - 14 - len(alpha_id) + if alpha_id_padding_len < 0: + raise ValueError("alpha_id too long, increase rec_len") + alpha_id_padding = "ff" * alpha_id_padding_len + + return alpha_id_enc + alpha_id_padding + ('%02x' % bcd_len) + ('%02x' % npi_ton) + bcd + ("ff" * 2) def sanitize_pin_adm(pin_adm, pin_adm_hex=None) -> Hexstr: diff --git a/tests/unittests/test_utils.py b/tests/unittests/test_utils.py index 0e61a61..ed22a73 100755 --- a/tests/unittests/test_utils.py +++ b/tests/unittests/test_utils.py @@ -157,20 +157,26 @@ self.assertEqual(msisdn_encoded, "ffffffffffffffffffffffffffff") msisdn_encoded = utils.enc_msisdn("+", npi=0x01, ton=0x03) self.assertEqual(msisdn_encoded, "ffffffffffffffffffffffffffff") + msisdn_encoded = utils.enc_msisdn("+4917279119183", npi=0x01, ton=0x01, alpha_id="Eigene Rufnummer", rec_len=34) + self.assertEqual(msisdn_encoded, "456967656e65205275666e756d6d6572ffffffff0891947172199181f3ffffffffff") def testDec_msisdn(self): msisdn_decoded = utils.dec_msisdn("0891946110325476f8ffffffffff") - self.assertEqual(msisdn_decoded, (1, 1, "+4916012345678")) + self.assertEqual(msisdn_decoded, ("", 1, 1, "+4916012345678")) msisdn_decoded = utils.dec_msisdn("04b1214365ffffffffffffffffff") - self.assertEqual(msisdn_decoded, (1, 3, "123456")) + self.assertEqual(msisdn_decoded, ("", 1, 3, "123456")) msisdn_decoded = utils.dec_msisdn("0bb121436587092143658709ffff") - self.assertEqual(msisdn_decoded, (1, 3, "12345678901234567890")) + self.assertEqual(msisdn_decoded, ("", 1, 3, "12345678901234567890")) msisdn_decoded = utils.dec_msisdn("ffffffffffffffffffffffffffff") self.assertEqual(msisdn_decoded, None) msisdn_decoded = utils.dec_msisdn("00112233445566778899AABBCCDDEEFF001122330bb121436587092143658709ffff") - self.assertEqual(msisdn_decoded, (1, 3, "12345678901234567890")) + self.assertEqual(msisdn_decoded, ('\x00\x11"3DUfw\x88\x99ª»ÌÝî\x00\x11"3', 1, 3, "12345678901234567890")) msisdn_decoded = utils.dec_msisdn("ffffffffffffffffffffffffffffffffffffffff0bb121436587092143658709ffff") - self.assertEqual(msisdn_decoded, (1, 3, "12345678901234567890")) + self.assertEqual(msisdn_decoded, ("", 1, 3, "12345678901234567890")) + msisdn_decoded = utils.dec_msisdn("456967656e65205275666e756d6d6572ffffffff0891947172199181f3ffffffffff") + self.assertEqual(msisdn_decoded, ( "Eigene Rufnummer", 1, 1, "+4917279119183" )) + msisdn_decoded = utils.dec_msisdn("456967656e65205275666e756d6d65720891947172199181f3ffffffffff") + self.assertEqual(msisdn_decoded, ( "Eigene Rufnummer", 1, 1, "+4917279119183" )) class TestLuhn(unittest.TestCase): def test_verify(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38118?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: I19ec8ba14551ec282fc0cc12ae2f6d528bdfc527 Gerrit-Change-Number: 38118 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: libosmo-sccp -> libosmo-sigtran

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38116?usp=email ) Change subject: libosmo-sccp -> libosmo-sigtran ...................................................................... libosmo-sccp -> libosmo-sigtran Adjust to: * libosmo-sccp.git has been renamed to libosmo-sigtran.git * libosmo-sccp static libraries have been split into libosmo-sccp-legacy.git build-old-tags-against-master: libosmo-sccp is intentionally kept in REPOS_TAGS, so old libosmo-sccp versions are built against current master of Osmocom libraries. Related: OS#6239 Change-Id: I509b1cc2a5260c82ef32e9543513110949311188 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmocom.sh M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/osmo-gsm-tester-builder.yml M scripts/common.sh M scripts/manuals/publish-manuals-for-tags.sh M scripts/obs/lib/config.py M scripts/osmo-depcheck/config.py M scripts/osmocom-api-doxygen.sh M scripts/osmocom-build-old-tags-against-master.sh M scripts/tarballs/publish-tarballs-for-tags.sh 12 files changed, 24 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/16/38116/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 61bd2b7..22ca629 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -77,7 +77,7 @@ build_default libosmo-gprs build_default libosmo-netif build_default libosmo-pfcp -build_default libosmo-sccp +build_default libosmo-sigtran build_default libsmpp34 build_default libgtpnl build_default osmo-ggsn \ diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 2c69356..d7ac90b 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -18,7 +18,7 @@ libosmo-gprs libosmo-netif libosmo-pfcp - libosmo-sccp + libosmo-sigtran libsmpp34 libusrp osmo-bsc diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f68102b..a21e42a 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -113,7 +113,7 @@ - libosmo-gprs - libosmo-netif - libosmo-pfcp - - libosmo-sccp + - libosmo-sigtran - libosmocore: slave_axis: !!python/tuple [io_uring] # OS#6405 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3b5f254..aceed0e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -129,13 +129,13 @@ - libosmo-netif: # Full triggers would be: # trigger: > - # master-libosmo-sccp, mastere-osmo-hlr, master-osmo-iuh, + # master-libosmo-sigtran, mastere-osmo-hlr, master-osmo-iuh, # master-osmo-mgw, master-osmo-msc, master-osmo-sgsn, master-osmo-hnodeb, # master-osmo-hnbgw # Optimized: # (see comment at libosmocore) trigger: > - master-libosmo-sccp, + master-libosmo-sigtran, master-osmo-hlr, master-osmo-mgw, master-osmo-sgsn @@ -150,7 +150,7 @@ master-osmo-upf, master-osmo-hnbgw - - libosmo-sccp: + - libosmo-sigtran: # Full triggers would be: # trigger: > # master-osmo-bsc, master-osmo-iuh, master-osmo-msc, @@ -172,7 +172,7 @@ cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"' # Full triggers would be: # trigger: > - # master-libosmo-abis, master-libosmo-netif, master-libosmo-sccp, + # master-libosmo-abis, master-libosmo-netif, master-libosmo-sigtran, # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb @@ -181,7 +181,7 @@ # libosmocore # -> master-libosmo-abis # -> master-libosmo-netif - # -> master-libosmo-sccp + # -> master-libosmo-sigtran # -> master-osmo-bsc # -> master-osmo-bsc-nat # -> master-osmo-iuh diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index ba925d0..ec9c29f 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -18,7 +18,7 @@ - osmo-trx - osmocom-bb - osmo-stp: - triggered-by: master-libosmo-sccp + triggered-by: master-libosmo-sigtran - osmo-bts-sysmo: triggered-by: master-osmo-bts - osmo-pcu-sysmo: diff --git a/scripts/common.sh b/scripts/common.sh index b4ab685..01548b8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -13,7 +13,8 @@ libosmo-gprs libosmo-netif libosmo-pfcp - libosmo-sccp + libosmo-sccp-legacy + libosmo-sigtran libosmocore libsmpp34 libusrp diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 8ca34a6..acf8557 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -233,7 +233,7 @@ get_repo_name_from_docs_dir() { case "$1" in osmo-stp) - echo "libosmo-sccp" + echo "libosmo-sigtran" ;; *) echo "$1" @@ -244,7 +244,7 @@ # $1: repo name get_docs_dir_from_repo_name() { case "$1" in - libosmo-sccp) + libosmo-sigtran) echo "osmo-stp" ;; *) diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 5b919d9..378fd32 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -58,7 +58,8 @@ "libosmo-gprs", "libosmo-netif", "libosmo-pfcp", - "libosmo-sccp", + "libosmo-sccp-legacy", # can be dropped after osmo-msc >= 1.12.x release + "libosmo-sigtran", "libosmocore", "libsmpp34", "libusrp", diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 708c0ac..39c79b4 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -36,9 +36,10 @@ "libosmovty"), "libosmo-abis": ("libosmoabis", "libosmotrau"), - "libosmo-sccp": ("libosmo-mtp", - "libosmo-sigtran", - "libosmo-xua"), + "libosmo-sigtran": ("libosmo-sigtran"), + "libosmo-sccp-legacy": ("libosmo-mtp", + "libosmo-sccp", + "libosmo-xua"), "osmo-ggsn": ("libgtp"), "osmo-hlr": ("libosmo-gsup-client"), "osmo-iuh": ("libosmo-ranap"), diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh index cfa5e61..0b9a965 100755 --- a/scripts/osmocom-api-doxygen.sh +++ b/scripts/osmocom-api-doxygen.sh @@ -8,7 +8,7 @@ libosmo-abis libosmo-dsp libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-gmr " diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh index 6d20591..eaf73088 100755 --- a/scripts/osmocom-build-old-tags-against-master.sh +++ b/scripts/osmocom-build-old-tags-against-master.sh @@ -16,7 +16,7 @@ libosmocore libosmo-abis libosmo-netif - libosmo-sccp + libosmo-sigtran libosmo-sccp-legacy libsmpp34 libasn1c @@ -31,6 +31,7 @@ libosmocore libosmo-netif libosmo-sccp + libosmo-sigtran osmo-bsc osmo-bts osmo-ggsn diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 09cd5cd..93e861b 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -14,7 +14,8 @@ libosmo-abis libosmo-netif libosmo-pfcp - libosmo-sccp + libosmo-sccp-legacy + libosmo-sigtran libosmocore libsmpp34 libusrp -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38116?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: I509b1cc2a5260c82ef32e9543513110949311188 Gerrit-Change-Number: 38116 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: ansible: update rpi4-2 and rpi4-3

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38115?usp=email ) Change subject: ansible: update rpi4-2 and rpi4-3 ...................................................................... ansible: update rpi4-2 and rpi4-3 Adjust SSH key and hostname after both have been reinstalled with 64bit raspbian 12. Related: OS#6549 Change-Id: I959a564bb597f433012a14ce56da4865d3392170 --- M ansible/hosts M ansible/util/known_hosts M jobs/update-osmo-ci-on-slaves.yml 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/38115/1 diff --git a/ansible/hosts b/ansible/hosts index 7878dfe..f68ea52 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -12,8 +12,8 @@ build4-deb12build-ansible ansible_host=2a01:4f8:121:200a::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" rpi4-raspbian12build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" -rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" -rpi4-raspbian11build-ansible-3 ansible_host=10.9.25.70 docker_max_image_space="20 GB" +rpi4-raspbian12build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" +rpi4-raspbian12build-ansible-3 ansible_host=10.9.25.70 docker_max_image_space="20 GB" lx2-raspbian11build-ansible ansible_host=10.9.25.28 docker_max_image_space="20 GB" jenkins_tmpfs=True [simtester] diff --git a/ansible/util/known_hosts b/ansible/util/known_hosts index 8b7fd8e..6067e86 100644 --- a/ansible/util/known_hosts +++ b/ansible/util/known_hosts @@ -3,8 +3,8 @@ 2a01:4f8:212:3762::1:3 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICl7tuOgN64+iYuYCtfCKaUbN9IWzKycpKVRgzsjVCPY 2a01:4f8:120:8470::1:4 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPKRz2Eg+h6RTREn52n/ip3pzUjRu9pw1XdjWUrvvi/ 10.9.25.50 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKn5hZBA8i3kcCuTORaQtLXf/NqpXxhkoldj9i60GOLo -10.9.25.60 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOAK6SQXmifMamE1VHL/1GmPkk6KhplzT20jSOwb8PyZ -10.9.25.70 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILioWTUt6CyZTceSKqy09mtlNUif+ETKTF6whnWuIROx +10.9.25.60 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMB+zhsSo20QYPGPNNgqknnbx3g8V+MBksHIF3GuPihu +10.9.25.70 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4KE0enH9e76eWTy8HLFO/2pzrZaP8G93mtWvfD8//W 2a01:4f8:121:200a::1:3 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGafw2VdeZo4YNvbu8VEBjDrsCFL+ZSbHtvhspNIQ9PR 2a01:4f8:121:200a::1:2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFyp0daWkfsRHErCVCcP/FZmtiRvFNAsK2A5TlQ6Ja+P 10.9.25.28 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0rQGxSxWJHwNNT5XdeuMPSYCAXpcDnFDzvyw5+sH3l diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 5da7d46..b4994f7 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -13,8 +13,8 @@ - host2-deb11build-ansible - lx2-raspbian11build-ansible - rpi4-raspbian12build-ansible-1 - - rpi4-raspbian11build-ansible-2 - - rpi4-raspbian11build-ansible-3 + - rpi4-raspbian12build-ansible-2 + - rpi4-raspbian12build-ansible-3 - simtester properties: - build-discarder: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38115?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: I959a564bb597f433012a14ce56da4865d3392170 Gerrit-Change-Number: 38115 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[XS] Change in osmo-trx[master]: contrib/jenkins: remove duplicate "set -ex"

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/38113?usp=email ) Change subject: contrib/jenkins: remove duplicate "set -ex" ...................................................................... Abandoned squashed into next patch -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/38113?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia071f1f1d37cd1936d6a4001edfe2c5c335787b8 Gerrit-Change-Number: 38113 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder

9 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024