- gerrit-log - lists.osmocom.org

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... cnlink: Fix several funcs missing prefix Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 --- M include/osmocom/hnbgw/cnlink.h M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_sccp.c M src/osmo-hnbgw/hnbgw_vty.c 6 files changed, 18 insertions(+), 17 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/hnbgw/cnlink.h b/include/osmocom/hnbgw/cnlink.h index 3aeed0b..3ede801 100644 --- a/include/osmocom/hnbgw/cnlink.h +++ b/include/osmocom/hnbgw/cnlink.h @@ -92,12 +92,13 @@ struct rate_ctr_group *ctrs; }; -struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); +struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr); +void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink); void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink); int hnbgw_cnlink_tx_ranap_reset(struct hnbgw_cnlink *cnlink); int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink); -static inline struct osmo_sccp_instance *cnlink_sccp(const struct hnbgw_cnlink *cnlink) +static inline struct osmo_sccp_instance *hnbgw_cnlink_sccp(const struct hnbgw_cnlink *cnlink) { if (!cnlink) return NULL; diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index d6098b4..5ca5675 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -70,4 +70,4 @@ void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool); int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); -char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index cea2827..ae6b266 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -34,7 +34,7 @@ #include <osmocom/hnbgw/tdefs.h> #include <osmocom/hnbgw/context_map.h> -struct hnbgw_cnlink *cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) +struct hnbgw_cnlink *hnbgw_cnlink_alloc(struct hnbgw_cnpool *cnpool, int nr) { struct osmo_fsm_inst *fi; struct hnbgw_cnlink *cnlink; @@ -84,7 +84,7 @@ hnbgw_sccp_user_put(hsu, HSU_USE_CNLINK); } -void cnlink_term_and_free(struct hnbgw_cnlink *cnlink) +void hnbgw_cnlink_term_and_free(struct hnbgw_cnlink *cnlink) { if (!cnlink) return; @@ -127,7 +127,7 @@ LOG_CNLINK(cnlink, DRANAP, LOGL_DEBUG, "Tx RANAP RESET to %s %s\n", cnlink_is_cs(cnlink) ? "IuCS" : "IuPS", - cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); if (g_hnbgw->config.plmn.mcc) { osmo_plmn_to_bcd(plmn_buf, &g_hnbgw->config.plmn); @@ -162,7 +162,7 @@ int hnbgw_cnlink_tx_ranap_reset_ack(struct hnbgw_cnlink *cnlink) { struct msgb *msg; - struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink); + struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); RANAP_GlobalRNC_ID_t grnc_id; RANAP_GlobalRNC_ID_t *use_grnc_id = NULL; uint8_t plmn_buf[3]; @@ -174,8 +174,8 @@ LOG_CNLINK(cnlink, DRANAP, LOGL_NOTICE, "Tx RANAP RESET ACK %s %s --> %s\n", cnlink_is_cs(cnlink) ? "IuCS" : "IuPS", - cnlink_sccp_addr_to_str(cnlink, &cnlink->hnbgw_sccp_user->local_addr), - cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->hnbgw_sccp_user->local_addr), + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr)); if (g_hnbgw->config.plmn.mcc) { osmo_plmn_to_bcd(plmn_buf, &g_hnbgw->config.plmn); diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 121c77f..e03f3c7 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -247,7 +247,7 @@ if (!create_if_missing) return NULL; - return cnlink_alloc(cnpool, nr); + return hnbgw_cnlink_alloc(cnpool, nr); } static bool is_cnlink_usable(struct hnbgw_cnlink *cnlink, bool is_emerg) @@ -414,9 +414,9 @@ #undef LOG_NRI } -char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) +char *hnbgw_cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr) { - struct osmo_sccp_instance *sccp = cnlink_sccp(cnlink); + struct osmo_sccp_instance *sccp = hnbgw_cnlink_sccp(cnlink); if (!sccp) return osmo_sccp_addr_dump(addr); return osmo_sccp_inst_addr_to_str_c(OTC_SELECT, sccp, addr); diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index 4699b2f..434c58e 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -123,9 +123,9 @@ LOGP(DCN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n", param->conn_id, - cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr), - cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr), - cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr)); + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr), + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr), + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr)); CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_CONNECT_CNF); @@ -159,7 +159,7 @@ LOGP(DCN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s cause=%s\n", param->conn_id, - cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr), + hnbgw_cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr), osmo_sua_sccp_cause_name(param->cause, cause_buf, sizeof(cause_buf))); CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_DISCONNECT_IND); diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index e2c3d8f..bfe0c73 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -154,7 +154,7 @@ vty_out(vty, " %s%s%s%s", cnlink->use.remote_addr_name ? : "", cnlink->use.remote_addr_name ? "=" : "", - cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr), + hnbgw_cnlink_sccp_addr_to_str(cnlink, &cnlink->remote_addr), VTY_NEWLINE); rt = osmo_ss7_route_lookup(ss7, cnlink->remote_addr.pc); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 08:49:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: cnlink: Fix several funcs missing prefix

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email ) Change subject: cnlink: Fix several funcs missing prefix ...................................................................... Patch Set 2: (1 comment) File include/osmocom/hnbgw/cnlink.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263/comment/0ea250d8_7621ebee?u… : PS2, Line 96: hnbgw_cnlink_term_and_free > (not willing to block here, but) why not adding it in the patch that actually needs this function... because I consider it to be part of this patch more than the other anyway, for the above mentioned reasons. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If20890bb99885e8c18732588376f8fdaa326d639 Gerrit-Change-Number: 40263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 08:49:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests TC_ps_rab_release(_abnormal)

by osmith

Attention is currently required from: fixeria, laforge, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email ) Change subject: hnbgw: Introduce tests TC_ps_rab_release(_abnormal) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia25efc2d6bf01d4a13e7fd1ce0563d20dd2e321e Gerrit-Change-Number: 40272 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 08:08:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce altstep as_pfcp_handle_del_req()

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40271?usp=email ) Change subject: hnbgw: Introduce altstep as_pfcp_handle_del_req() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40271?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I94101b5f0ad8634db68f0a9d5230c00926b02061 Gerrit-Change-Number: 40271 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 08:07:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL)

by osmith

Attention is currently required from: fixeria, laforge, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email ) Change subject: Support tearing down PFCP upon PS-RAB-ASS-REQ (REL) ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/osmo-hnbgw/ps_rab_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275/comment/e7d4fc75_9c5a7152?u… : PS4, Line 505: unknwon unknown -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea7f2cea4aa1fbab12cb8bf0275cd43d9e0713c2 Gerrit-Change-Number: 40275 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 08:04:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[XS] Change in osmo-hnbgw[master]: ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over ...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40276?usp=email ) Change subject: ps_rab_ass_fsm: Fix potential use-after-free if Tx RAB-ASS-RESP over SCCP fails ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40276?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id605f2b279a4d886399de27f6a94622ad7bf982b Gerrit-Change-Number: 40276 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 07:56:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: Clean up calls to ps_rab_ass_fsm_state_chg()

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?usp=email ) Change subject: Clean up calls to ps_rab_ass_fsm_state_chg() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40274?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7c9a67ebe192ba30fa474f84eaee1db2a718fa35 Gerrit-Change-Number: 40274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 07:55:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: context_map: Rename ps_rab(_ass) to denote it is a list

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email ) Change subject: context_map: Rename ps_rab(_ass) to denote it is a list ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40273?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6ac029e6a820a031a443dae8c83e44f6ae9fb5fa Gerrit-Change-Number: 40273 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 May 2025 07:54:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 3 weeks

1
0
0 0

[S] Change in docker-playground[master]: Fix remaining users of deprecated git.osmocom.org

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40261?usp=email ) Change subject: Fix remaining users of deprecated git.osmocom.org ...................................................................... Fix remaining users of deprecated git.osmocom.org git.osmocom.org is deprecated and will be removed at some point. Make sure we don't use it anywhere in our docker containers. Notably this drops the following line without replacement: ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit This was not needed, because the patch for OSMO_PYTHON2_TESTS_COMMIT will never change, it points to a commit hash (unlike checking master, where the patch can change). Change-Id: I2c7ab8fe9e87dd973df44ae1c5ff90930627040c --- M README.md M debian-bullseye-jenkins-arm/Dockerfile M debian-bullseye-jenkins/Dockerfile M debian-buster-jenkins-arm/Dockerfile M debian-buster-jenkins/Dockerfile M debian-sid-jenkins/Dockerfile 6 files changed, 15 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index 314c91e..eeb9272 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ * `IMAGE_SUFFIX`: the version of the Osmocom stack to run the testsuite against. Default is `master`, set this to `latest` to test the last stable releases. -* `OSMO_TTCN3_BRANCH`: [osmo-ttcn3-hacks.git](https://git.osmocom.org/osmo-ttcn3-hacks/) +* `OSMO_TTCN3_BRANCH`: [osmo-ttcn3-hacks.git](https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks) branch, which will be used when building a `ttcn3-*` docker image. Defaults to `master`. * `OSMO_BSC_BRANCH`, `OSMO_MSC_BRANCH`, ...: branch of the appropriate diff --git a/debian-bullseye-jenkins-arm/Dockerfile b/debian-bullseye-jenkins-arm/Dockerfile index 31958ab..f18dc61 100644 --- a/debian-bullseye-jenkins-arm/Dockerfile +++ b/debian-bullseye-jenkins-arm/Dockerfile @@ -51,13 +51,13 @@ RUN chown build:build /build # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile index 5132c0a..aadb338 100644 --- a/debian-bullseye-jenkins/Dockerfile +++ b/debian-bullseye-jenkins/Dockerfile @@ -165,20 +165,19 @@ # Install osmo-python-tests for python2 (OS#5950) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed -ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ @@ -186,7 +185,7 @@ /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale diff --git a/debian-buster-jenkins-arm/Dockerfile b/debian-buster-jenkins-arm/Dockerfile index f0d5379..c918b15 100644 --- a/debian-buster-jenkins-arm/Dockerfile +++ b/debian-buster-jenkins-arm/Dockerfile @@ -50,13 +50,13 @@ RUN chown build:build /build # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 44c382d..f0bb6c7 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -162,20 +162,19 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed -ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ @@ -183,7 +182,7 @@ /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale diff --git a/debian-sid-jenkins/Dockerfile b/debian-sid-jenkins/Dockerfile index bb66f13..5650192 100644 --- a/debian-sid-jenkins/Dockerfile +++ b/debian-sid-jenkins/Dockerfile @@ -138,20 +138,19 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed -ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ @@ -159,8 +158,8 @@ /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit -RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit +RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40261?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: I2c7ab8fe9e87dd973df44ae1c5ff90930627040c Gerrit-Change-Number: 40261 Gerrit-PatchSet: 3 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>

1 month, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log