- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: enft_kpi: use command/expression templates from enftables

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email ) Change subject: enft_kpi: use command/expression templates from enftables ...................................................................... enft_kpi: use command/expression templates from enftables Change-Id: I421ba5ccc8956586136466d5eb50d6ace69eeb67 Related: SYS#7307 --- M src/enft_kpi.erl 1 file changed, 22 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/39/40439/1 diff --git a/src/enft_kpi.erl b/src/enft_kpi.erl index d5d5ce3..3afe9d5 100644 --- a/src/enft_kpi.erl +++ b/src/enft_kpi.erl @@ -147,15 +147,17 @@ TName = maps:get(table_name, Cfg, "osmo-s1gw"), Interval = maps:get(interval, Cfg, 3000), %% ignore (accept) anything but GTPU @ udp/2152 - R1 = [nft_expr_match_ip_proto("udp", ?OP_NEQ), nft_expr_accept()], - R2 = [nft_expr_match_udp_dport(?GTPU_PORT, ?OP_NEQ), nft_expr_accept()], - Cmds = [nft_cmd_add_table(TName), + R1 = [enftables:nft_expr_match_ip_proto("udp", ?OP_NEQ), + enftables:nft_expr_accept()], + R2 = [enftables:nft_expr_match_udp_dport(?GTPU_PORT, ?OP_NEQ), + enftables:nft_expr_accept()], + Cmds = [enftables:nft_cmd_add_table(TName, [<< "owner" >>]), nft_cmd_add_chain(TName, "gtpu-ul", "prerouting"), nft_cmd_add_chain(TName, "gtpu-dl", "postrouting"), - nft_cmd_add_rule(TName, "gtpu-ul", R1), - nft_cmd_add_rule(TName, "gtpu-dl", R1), - nft_cmd_add_rule(TName, "gtpu-ul", R2), - nft_cmd_add_rule(TName, "gtpu-dl", R2) + enftables:nft_cmd_add_rule(TName, "gtpu-ul", R1), + enftables:nft_cmd_add_rule(TName, "gtpu-dl", R1), + enftables:nft_cmd_add_rule(TName, "gtpu-ul", R2), + enftables:nft_cmd_add_rule(TName, "gtpu-dl", R2) ], case nft_exec(Cmds) of ok -> @@ -221,7 +223,7 @@ handle_call(fetch_counters, _From, #state{cfg = #{table_name := TName}} = S) -> ?LOG_DEBUG("Fetching NFT counters"), - Cmds = [nft_cmd_list_counters(TName)], + Cmds = [enftables:nft_cmd_list_counters(TName)], case nft_exec(Cmds) of {ok, Res} -> Ctrs = parse_nft_counters(Res), @@ -272,7 +274,7 @@ #state{cfg = #{table_name := TName}, registry = R0} = S) -> ?LOG_DEBUG("Fetching and reporting NFT counters"), - Cmds = [nft_cmd_list_counters(TName)], + Cmds = [enftables:nft_cmd_list_counters(TName)], case nft_exec(Cmds) of {ok, Res} -> Ctrs = parse_nft_counters(Res), @@ -312,7 +314,7 @@ ?LOG_NOTICE("Terminating, reason ~p", [Reason]), case Cfg of #{enable := true, table_name := TName} -> - nft_exec([nft_cmd_del_table(TName)]), %% delete the table + nft_exec([enftables:nft_cmd_del_table(TName)]), %% delete the table ok; _ -> ok %% stub mode end. @@ -377,10 +379,11 @@ #{table_name := TName}) -> CName = enb_nft_counter_name(ULDL, GlobalENBId), RName = enb_nft_rule_name(ULDL), + Counter = enftables:nft_counter(TName, CName), Rule = [nft_expr_match_ip_addr({ULDL, Addr}), - nft_expr_counter(CName)], - Cmds = [nft_cmd_add_counter(TName, CName), - nft_cmd_add_rule(TName, RName, Rule) + enftables:nft_expr_counter(CName)], + Cmds = [enftables:nft_cmd_add_counter(Counter), + enftables:nft_cmd_add_rule(TName, RName, Rule) ], case nft_exec(Cmds) of ok -> @@ -419,8 +422,9 @@ [Pid, GlobalENBId, ULDL]), CName = enb_nft_counter_name(ULDL, GlobalENBId), RName = enb_nft_rule_name(ULDL), - Cmds = [nft_cmd_del_rule(TName, RName, Handle), - nft_cmd_del_counter(TName, CName) + Counter = enftables:nft_counter(TName, CName), + Cmds = [enftables:nft_cmd_del_rule(TName, RName, Handle), + enftables:nft_cmd_del_counter(Counter) ], case nft_exec(Cmds) of ok -> ok; @@ -525,7 +529,7 @@ nft_chain_last_handle(TName, CName) -> - Cmds = [nft_cmd_list_chain(TName, CName)], + Cmds = [enftables:nft_cmd_list_chain(TName, CName)], case nft_exec(Cmds) of {ok, Res} -> #{<< "rule" >> := Rule} = lists:last(Res), @@ -536,21 +540,6 @@ end. -nft_cmd_add_table(TName) -> - T = #{family => << "inet" >>, - name => list_to_binary(TName), - flags => [<< "owner" >>] - }, - #{add => #{table => T}}. - - -nft_cmd_del_table(TName) -> - T = #{family => << "inet" >>, - name => list_to_binary(TName) - }, - #{delete => #{table => T}}. - - nft_cmd_add_chain(TName, CName, Hook) -> C = #{family => << "inet" >>, table => list_to_binary(TName), @@ -563,95 +552,12 @@ #{add => #{chain => C}}. -nft_cmd_add_rule(TName, CName, Expr) -> - R = #{family => << "inet" >>, - table => list_to_binary(TName), - chain => list_to_binary(CName), - expr => Expr - }, - #{add => #{rule => R}}. - - -nft_cmd_del_rule(TName, CName, Handle) -> - R = #{family => << "inet" >>, - table => list_to_binary(TName), - chain => list_to_binary(CName), - handle => Handle - }, - #{delete => #{rule => R}}. - - -nft_counter(TName, Name) -> - #{family => << "inet" >>, - table => list_to_binary(TName), - name => list_to_binary(Name) - }. - -nft_cmd_add_counter(TName, Name) -> - #{add => #{counter => nft_counter(TName, Name)}}. - -nft_cmd_del_counter(TName, Name) -> - #{delete => #{counter => nft_counter(TName, Name)}}. - - --spec nft_expr_match_payload({Proto, Field}, Value, Op) -> map() - when Proto :: string(), - Field :: string(), - Value :: term(), - Op :: string(). -nft_expr_match_payload({Proto, Field}, Value, Op) -> - Left = #{payload => #{protocol => list_to_binary(Proto), - field => list_to_binary(Field)}}, - #{match => #{left => Left, - right => Value, - op => list_to_binary(Op)}}. - - -nft_expr_match_ip_proto(Proto, Op) -> - nft_expr_match_payload({"ip", "protocol"}, - list_to_binary(Proto), Op). - -nft_expr_match_ip_saddr(Addr, Op) -> - nft_expr_match_payload({"ip", "saddr"}, - list_to_binary(Addr), Op). - -nft_expr_match_ip_daddr(Addr, Op) -> - nft_expr_match_payload({"ip", "daddr"}, - list_to_binary(Addr), Op). - -nft_expr_match_udp_dport(Port, Op) -> - nft_expr_match_payload({"udp", "dport"}, Port, Op). - - -spec nft_expr_match_ip_addr(uldl_addr()) -> map(). nft_expr_match_ip_addr({ul, Addr}) -> - nft_expr_match_ip_saddr(Addr, ?OP_EQ); + enftables:nft_expr_match_ip_saddr(Addr, ?OP_EQ); nft_expr_match_ip_addr({dl, Addr}) -> - nft_expr_match_ip_daddr(Addr, ?OP_EQ). - - -nft_expr_accept() -> - #{accept => null}. - - -nft_expr_counter(Name) -> - #{counter => list_to_binary(Name)}. - - -nft_cmd_list_chain(TName, CName) -> - C = #{family => << "inet" >>, - table => list_to_binary(TName), - name => list_to_binary(CName) - }, - #{list => #{chain => C}}. - - -nft_cmd_list_counters(TName) -> - T = #{family => << "inet" >>, - name => list_to_binary(TName) - }, - #{list => #{counters => #{table => T}}}. + enftables:nft_expr_match_ip_daddr(Addr, ?OP_EQ). -spec heartbeat(timeout()) -> no_return(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I421ba5ccc8956586136466d5eb50d6ace69eeb67 Gerrit-Change-Number: 40439 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 6 days

1
0
0 0

[M] Change in osmo-ci[master]: jobs/reminder-extend-obs-key: new job

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40431?usp=email ) Change subject: jobs/reminder-extend-obs-key: new job ...................................................................... jobs/reminder-extend-obs-key: new job Add a script that downloads the current OBS pubkey, checks its expiration date and fails if it is in less than a year. The idea is to extend it for two years every year (so users have enough time to update their osmocom-keyring package). Change-Id: I934282efbe1fe3bd86813ad53df38ef79575bf8d --- A jobs/reminder-extend-obs-key.yml A scripts/reminder-extend-obs-key.sh 2 files changed, 84 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/reminder-extend-obs-key.yml b/jobs/reminder-extend-obs-key.yml new file mode 100644 index 0000000..d2728dc --- /dev/null +++ b/jobs/reminder-extend-obs-key.yml @@ -0,0 +1,39 @@ +--- +- job: + name: 'reminder-extend-obs-key' + project-type: freestyle + concurrent: false + defaults: global + description: | + Reminder for extending the OBS key (OS#6567) + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 30 + parameters: + - string: + name: BRANCH_OSMO_CI + description: | + osmo-ci.git branch with scripts/tarballs/publish-tarballs-for-tags.sh + default: 'master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed build notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' + builders: + - shell: | + PUBLISH=1 scripts/reminder-extend-obs-key.sh + scm: + - git: + branches: + - '$BRANCH_OSMO_CI' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + wipe-workspace: true + triggers: + - timed: "@daily" + publishers: + - email: + notify-every-unstable-build: true + recipients: '$EMAIL_NOTIFICATIONS' diff --git a/scripts/reminder-extend-obs-key.sh b/scripts/reminder-extend-obs-key.sh new file mode 100755 index 0000000..2eeebb0 --- /dev/null +++ b/scripts/reminder-extend-obs-key.sh @@ -0,0 +1,45 @@ +#!/bin/sh -ex +mkdir -p _temp +cd _temp + +if ! [ -e public_key ]; then + wget -q https://obs.osmocom.org/projects/osmocom/public_key +fi + +gpg --show-keys public_key + +EXPIRATION_DATE="$(gpg --show-keys public_key | grep -o 'expires: [0-9-]*' | cut -d ' ' -f2)" +EXPIRATION_DATE_S="$(date -d "$EXPIRATION_DATE" +%s)" +ONE_YEAR_FROM_NOW="$(date -d "+356 days" +%Y-%m-%d)" +ONE_YEAR_FROM_NOW_S="$(date -d "$ONE_YEAR_FROM_NOW" +%s)" + +set +x + +if [ "$(echo "$EXPIRATION_DATE" | wc -l)" != 1 ] || [ "$EXPIRATION_DATE_S" -lt "$(date -d "2026-01-01" +%s)" ]; then + echo "Failed to get valid expiration date" + exit 1 +fi + +if [ "$ONE_YEAR_FROM_NOW_S" -lt "$(date -d "2026-01-01" +%s)" ]; then + echo "Failed to get date one year from now" + exit 1 +fi + +echo +echo "Checking if expiration date ($EXPIRATION_DATE) is in less than a year from now ($ONE_YEAR_FROM_NOW)..." + +if [ "$ONE_YEAR_FROM_NOW_S" -gt "$EXPIRATION_DATE_S" ]; then + echo + echo "=============================================================" + echo "The OBS signing key must be extended!" + echo + echo "Instructions:" + echo "https://osmocom.org/projects/osmocom-servers/wiki/OBS_server_setup#Extendin…" + echo + echo "The key becomes valid for 2 years, we extend it after 1 year." + echo "=============================================================" + echo + exit 1 +else + echo "=> OK" +fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40431?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: I934282efbe1fe3bd86813ad53df38ef79575bf8d Gerrit-Change-Number: 40431 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/osmocom-obs: add EMAIL_NOTIFICATIONS argument

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40425?usp=email ) Change subject: jobs/osmocom-obs: add EMAIL_NOTIFICATIONS argument ...................................................................... jobs/osmocom-obs: add EMAIL_NOTIFICATIONS argument Change-Id: I5009f7b722c7455ee6dfd25a6b5370929c9bc469 --- M jobs/osmocom-obs.yml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 39fa5fb..fd11055 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -44,6 +44,10 @@ name: BRANCH description: osmo-ci.git branch default: 'refs/remotes/origin/master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed job notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' builders: - shell: | export PYTHONUNBUFFERED=1 @@ -72,6 +76,6 @@ publishers: - email: notify-every-unstable-build: true - recipients: 'jenkins-notifications(a)lists.osmocom.org' + recipients: '$EMAIL_NOTIFICATIONS' # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40425?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: I5009f7b722c7455ee6dfd25a6b5370929c9bc469 Gerrit-Change-Number: 40425 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: repo without manuals: fix draft removal logic

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40426?usp=email ) Change subject: OBS: repo without manuals: fix draft removal logic ...................................................................... OBS: repo without manuals: fix draft removal logic Adjust set_asciidoc_style_without_draft_watermark() so it does not fail in repositories that do not have any manuals. Fixes: 3b348d5e ("OBS: remove pdf draft watermark for latest pkgs") Change-Id: Ie93430a1f7bd2bae6886e87755e79ff93ea609e7 --- M scripts/obs/lib/srcpkg.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 6f4e613..3a09af3 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -169,10 +169,12 @@ def set_asciidoc_style_without_draft_watermark(project): repo_path = lib.git.get_repo_path(project) - doc_makefiles = lib.run_cmd(["grep", "-r", "-l", "include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc"], cwd=repo_path) + doc_makefiles = lib.run_cmd(["grep", "-r", "-l", "include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc"], cwd=repo_path, check=False) doc_makefiles = doc_makefiles.output.rstrip().split("\n") for doc_makefile in doc_makefiles: + if doc_makefile == "": + continue print(f"{project}: setting asciidoc style to remove draft watermark in {doc_makefile}") lib.run_cmd(["sed", "-i", '/\\/build\\/Makefile\\.asciidoc\\.inc/s/^/ ASCIIDOCSTYLE = $(BUILDDIR)\\/custom-dblatex.sty\\n/', -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40426?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: Ie93430a1f7bd2bae6886e87755e79ff93ea609e7 Gerrit-Change-Number: 40426 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: remove libosmo-sccp-legacy

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40427?usp=email ) Change subject: OBS: remove libosmo-sccp-legacy ...................................................................... OBS: remove libosmo-sccp-legacy Stop building libosmo-sccp-legacy, which is not needed anymore since osmo-msc 1.13.0 has been tagged some time ago. Change-Id: I086e3eff10e79bddd8ec23927b46cc58a7101de6 --- M scripts/obs/lib/config.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index c6f373e..dc67757 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -58,7 +58,6 @@ "libosmo-gprs", "libosmo-netif", "libosmo-pfcp", - "libosmo-sccp-legacy", # can be dropped after osmo-msc >= 1.12.x release "libosmo-sigtran", "libosmocore", "libsmpp34", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40427?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: I086e3eff10e79bddd8ec23927b46cc58a7101de6 Gerrit-Change-Number: 40427 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: add the new osmocom-keyring package

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40428?usp=email ) Change subject: OBS: add the new osmocom-keyring package ...................................................................... OBS: add the new osmocom-keyring package The public key for OBS packages needs to be extended every two years. When the previous key expires, it is not possible to update packages anymore until users replace the old key with the new, extended key. To make this less inconvenient for users, introduce a new osmocom-keyring package that holds the current key (valid for 2 years), which will get updated every year with an extended key (valid for another 2 years, I'll add a jenkins job to remind us). This means as long as users upgrade their packages once a year, they will automatically receive the new key. Related: https://gitea.osmocom.org/osmocom/osmocom-keyring Related: OS#6567 Change-Id: I370b4fa0c6f7e8a925b1ddd7c1c47980a8f4fea2 --- M scripts/obs/lib/config.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index dc67757..4d8bcd3 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -47,6 +47,8 @@ # NOTE: Consider whether new packages should be added to EXCLUDE_PACKAGES in # osmocom-obs-nightly-asan.yml. projects_osmocom = [ + "osmocom-keyring", + "erlang/osmo_dia2gsup", "erlang/osmo-epdg", "erlang/osmo-s1gw", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40428?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: I370b4fa0c6f7e8a925b1ddd7c1c47980a8f4fea2 Gerrit-Change-Number: 40428 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: move meta_package_version to config variable

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40429?usp=email ) Change subject: OBS: move meta_package_version to config variable ...................................................................... OBS: move meta_package_version to config variable Have a config variable instead of hardcoding the value two times. Change-Id: I003e27ed6d0247097ba33d33e578b9669be36f9a --- M scripts/obs/lib/config.py M scripts/obs/lib/metapkg.py M scripts/obs/update_obs_project.py 3 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 4d8bcd3..1a22f23 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -168,3 +168,6 @@ ] check_new_distros_version_regex = re.compile(r'[0-9.]+$') + +# Version of the osmocom-latest / osmocom-nightly etc. meta package +meta_package_version = "1.0.0" diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index 1b78777..b60e2f2 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -86,7 +86,7 @@ feed = lib.args.feed pkgname = lib.args.conflict_pkgname or f"osmocom-{feed}" conflict_version = lib.args.conflict_version - version = conflict_version if conflict_version else "1.0.0" + version = conflict_version if conflict_version else lib.config.meta_package_version print(f"{pkgname}: generating meta package {version}") prepare_source_dir(pkgname) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 0852693..6668a8e 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -91,7 +91,7 @@ the git remote. """ if is_meta_pkg: conflict_version = lib.args.conflict_version - latest_version = conflict_version if conflict_version else "1.0.0" + latest_version = conflict_version if conflict_version else lib.config.meta_package_version else: if feed == "master": latest_version = lib.git.get_head_remote(package, branch, -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40429?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: I003e27ed6d0247097ba33d33e578b9669be36f9a Gerrit-Change-Number: 40429 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: let meta package depend on osmocom-keyring

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40430?usp=email ) Change subject: OBS: let meta package depend on osmocom-keyring ...................................................................... OBS: let meta package depend on osmocom-keyring Let the meta package (osmocom-latest, osmocom-nightly etc.) depend on osmocom-keyring. This means that after the user has enabled any of the official Osmocom OBS repositories and installs a package from there, the osmocom-keyring package will get installed as well, which results in having an up-to-date /usr/share/osmocom-keyring/osmocom.asc. Change-Id: Id4d213f355338b39a9ec5ccffc16179f6e472102 --- M scripts/obs/lib/config.py M scripts/obs/lib/metapkg.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 1a22f23..7d6b9e0 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -170,4 +170,4 @@ check_new_distros_version_regex = re.compile(r'[0-9.]+$') # Version of the osmocom-latest / osmocom-nightly etc. meta package -meta_package_version = "1.0.0" +meta_package_version = "1.1.0" diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index b60e2f2..4b67db2 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -39,7 +39,7 @@ f.write("Standards-Version: 3.9.8\n") f.write("\n") f.write(f"Package: {pkgname}\n") - f.write("Depends: ${misc:Depends}\n") + f.write("Depends: osmocom-keyring ${misc:Depends}\n") f.write("Architecture: any\n") f.write(f"Conflicts: {', '.join(conflicts)}\n") f.write(f"Description: Dummy package, conflicts with {conflicts}\n") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40430?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: Id4d213f355338b39a9ec5ccffc16179f6e472102 Gerrit-Change-Number: 40430 Gerrit-PatchSet: 1 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>

3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/reminder-extend-obs-key: new job

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40431?usp=email ) Change subject: jobs/reminder-extend-obs-key: new job ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40431?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: I934282efbe1fe3bd86813ad53df38ef79575bf8d Gerrit-Change-Number: 40431 Gerrit-PatchSet: 1 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> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Jun 2025 08:40:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/reminder-extend-obs-key: new job

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40431?usp=email ) Change subject: jobs/reminder-extend-obs-key: new job ...................................................................... Patch Set 1: (1 comment) File jobs/reminder-extend-obs-key.yml: https://gerrit.osmocom.org/c/osmo-ci/+/40431/comment/9b14a0c5_b5fdc625?usp=… : PS1, Line 35: - timed: "@daily" > maybe weekly/monthly may be enough? This is a very lightweight job, so running it daily should not be a problem. The advantage is that if it fails, we get daily reminders until we fix it. IMHO that is much more appropriate than only weekly/monthly reminders. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40431?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: I934282efbe1fe3bd86813ad53df38ef79575bf8d Gerrit-Change-Number: 40431 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Jun 2025 08:40:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log