August 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ci[master]: scripts/obs/sync_obs_projects.py: format with ruff
by osmith 20 Aug '25

20 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40888?usp=email ) Change subject: scripts/obs/sync_obs_projects.py: format with ruff ...................................................................... scripts/obs/sync_obs_projects.py: format with ruff Change-Id: I1b7281b32c352b09a0641175b6f70751010800d9 --- M .ruff.toml M scripts/obs/sync_obs_projects.py 2 files changed, 96 insertions(+), 53 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/.ruff.toml b/.ruff.toml index 6f6bd68..d8e72e2 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -18,7 +18,6 @@ "scripts/obs/lib/osc.py", "scripts/obs/lib/rpm_spec.py", "scripts/obs/lib/srcpkg.py", - "scripts/obs/sync_obs_projects.py", "scripts/obs/update_obs_project.py", "scripts/osmo-depcheck/buildstack.py", "scripts/osmo-depcheck/config.py", diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index bf6b0b7..d494ed4 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -23,34 +23,57 @@ def parse_args(): - parser = argparse.ArgumentParser(description="Sync OBS projects (prjconf," - " meta) from another instance (OS#6165)") - parser.add_argument("-d", "--docker", - help="run in docker to avoid installing required pkgs", - action="store_true") - parser.add_argument("-n", "--no-skip-up-to-date", - dest="skip_up_to_date", action="store_false", - help="always assume projects are outdated") - parser.add_argument("-v", "--verbose", action="store_true", - help="always print shell commands and their output," - " instead of only printing them on error") - parser.add_argument("projects", - help="source OBS project, e.g. Debian:12", - nargs="+") + parser = argparse.ArgumentParser(description="Sync OBS projects (prjconf, meta) from another instance (OS#6165)") + parser.add_argument( + "-d", + "--docker", + help="run in docker to avoid installing required pkgs", + action="store_true", + ) + parser.add_argument( + "-n", + "--no-skip-up-to-date", + dest="skip_up_to_date", + action="store_false", + help="always assume projects are outdated", + ) + parser.add_argument( + "-v", + "--verbose", + action="store_true", + help="always print shell commands and their output, instead of only printing them on error", + ) + parser.add_argument( + "projects", + help="source OBS project, e.g. Debian:12", + nargs="+", + ) advanced = parser.add_argument_group("advanced options") - advanced.add_argument("-A", "--apiurl", help="source OBS API URL" - " (default: https://api.opensuse.org)", - default="https://api.opensuse.org") - advanced.add_argument("-p", "--prefix", default="openSUSE.org-mirror", - help="destination OBS prefix" - " (default: openSUSE.org-mirror)") - advanced.add_argument("-t", "--to-apiurl", help="destination OBS API URL" - " (default: https://obs.osmocom.org)", - default="https://obs.osmocom.org") - advanced.add_argument("-w", "--weburl", default="https://build.opensuse.org", - help="source OBS web URL (default:" - " https://build.opensuse.org)") + advanced.add_argument( + "-A", + "--apiurl", + help="source OBS API URL (default: https://api.opensuse.org)", + default="https://api.opensuse.org", + ) + advanced.add_argument( + "-p", + "--prefix", + default="openSUSE.org-mirror", + help="destination OBS prefix (default: openSUSE.org-mirror)", + ) + advanced.add_argument( + "-t", + "--to-apiurl", + help="destination OBS API URL (default: https://obs.osmocom.org)", + default="https://obs.osmocom.org", + ) + advanced.add_argument( + "-w", + "--weburl", + default="https://build.opensuse.org", + help="source OBS web URL (default: https://build.opensuse.org)", + ) args = parser.parse_args() lib.set_args(args) @@ -79,9 +102,9 @@ def generate_prjconf_header(project): - """ This header gets prepended to the prjconf, before it gets written to - the destination OBS. This script uses it to determine whether the - project needs to be updated next time it runs. """ + """This header gets prepended to the prjconf, before it gets written to + the destination OBS. This script uses it to determine whether the + project needs to be updated next time it runs.""" with open(temp_source_prjconf, "rb") as h: source_prjconf = h.read() with open(temp_source_meta, "rb") as h: @@ -128,10 +151,12 @@ if project.startswith("Raspbian:"): return ["armv7l"] - return ["aarch64", - "armv7l", - "i586", - "x86_64"] + return [ + "aarch64", + "armv7l", + "i586", + "x86_64", + ] def rewrite_meta(project): @@ -147,9 +172,11 @@ for description in root.findall("description"): href = f"{lib.args.weburl}/project/show/{project}" - description.text = ("This project gets synced from:" - f" <a href='{html.escape(href)}'>{project}</a>\n" - "Do not modify manually. See OS#6165.\n") + description.text = ( + "This project gets synced from:" + f" <a href='{html.escape(href)}'>{project}</a>\n" + "Do not modify manually. See OS#6165.\n" + ) for repository in root.findall(".repository"): repo_name = repository.get("name") @@ -188,11 +215,21 @@ url = download.get("url") print(f" changing url to https: {url}") if url.startswith("http://ftp.de.debian.org/debian"): - download.set("url", url.replace("http://ftp.de.debian.org/debian", - "https://debian.inf.tu-dresden.de/debian")) + download.set( + "url", + url.replace( + "http://ftp.de.debian.org/debian", + "https://debian.inf.tu-dresden.de/debian", + ), + ) elif url.startswith("http://security.debian.org/debian-security"): - download.set("url", url.replace("http://security.debian.org/debian-security", - "https://debian.inf.tu-dresden.de/debian-security")) + download.set( + "url", + url.replace( + "http://security.debian.org/debian-security", + "https://debian.inf.tu-dresden.de/debian-security", + ), + ) else: raise RuntimeError(f"Unexpected mirror URL: {url}") for pubkey in download.findall("pubkey"): @@ -256,11 +293,15 @@ return # Show prjconf diff (old prjconf was retrieved in is_up_to_date()) - diff = lib.run_cmd(["colordiff", - "-c3", - temp_dest_old_prjconf, - temp_dest_new_prjconf], - check=False) + diff = lib.run_cmd( + [ + "colordiff", + "-c3", + temp_dest_old_prjconf, + temp_dest_new_prjconf, + ], + check=False, + ) if diff.returncode: print(f"{project_new}: prjconf changes:") print(diff.output, end="") @@ -270,13 +311,16 @@ # Show meta diff lib.osc.get_meta(temp_dest_old_meta) for file in [temp_dest_old_meta, temp_dest_new_meta]: - lib.run_cmd(f"xmllint --format {shlex.quote(file)} > {shlex.quote(file)}.pretty", - shell=True) - diff = lib.run_cmd(["colordiff", - "-c3", - f"{temp_dest_old_meta}.pretty", - f"{temp_dest_new_meta}.pretty"], - check=False) + lib.run_cmd(f"xmllint --format {shlex.quote(file)} > {shlex.quote(file)}.pretty", shell=True) + diff = lib.run_cmd( + [ + "colordiff", + "-c3", + f"{temp_dest_old_meta}.pretty", + f"{temp_dest_new_meta}.pretty", + ], + check=False, + ) if diff.returncode: print(f"{project_new}: meta changes:") print(diff.output, end="") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40888?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: I1b7281b32c352b09a0641175b6f70751010800d9 Gerrit-Change-Number: 40888 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>

1 0

[M] Change in osmo-ci[master]: scripts/obs/sync_obs_projects.py: format with ruff
by fixeria 20 Aug '25

20 Aug '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40888?usp=email ) Change subject: scripts/obs/sync_obs_projects.py: format with ruff ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40888?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: I1b7281b32c352b09a0641175b6f70751010800d9 Gerrit-Change-Number: 40888 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Aug 2025 10:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: support security.d.o
by fixeria 20 Aug '25

20 Aug '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40887?usp=email ) Change subject: OBS: sync_obs_projects: support security.d.o ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40887?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: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 Gerrit-Change-Number: 40887 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Aug 2025 10:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add email parameter
by osmith 20 Aug '25

20 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40886?usp=email ) Change subject: jobs/osmocom-obs-sync: add email parameter ...................................................................... jobs/osmocom-obs-sync: add email parameter Change-Id: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec --- M jobs/osmocom-obs-sync.yml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index 399f7ff..ade61b1 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -17,6 +17,10 @@ name: CI_BRANCH description: osmo-ci.git branch default: 'master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed job notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' scm: - git: branches: @@ -52,4 +56,4 @@ publishers: - email: notify-every-unstable-build: true - recipients: 'jenkins-notifications(a)lists.osmocom.org' + recipients: '$EMAIL_NOTIFICATIONS' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40886?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: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec Gerrit-Change-Number: 40886 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>

1 0

[M] Change in osmo-ci[master]: scripts/obs/sync_obs_projects.py: format with ruff
by pespin 20 Aug '25

20 Aug '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40888?usp=email ) Change subject: scripts/obs/sync_obs_projects.py: format with ruff ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40888?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: I1b7281b32c352b09a0641175b6f70751010800d9 Gerrit-Change-Number: 40888 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Aug 2025 10:48:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: support security.d.o
by pespin 20 Aug '25

20 Aug '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40887?usp=email ) Change subject: OBS: sync_obs_projects: support security.d.o ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40887?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: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 Gerrit-Change-Number: 40887 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Aug 2025 10:47:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add email parameter
by pespin 20 Aug '25

20 Aug '25

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40886?usp=email ) Change subject: jobs/osmocom-obs-sync: add email parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40886?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: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec Gerrit-Change-Number: 40886 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Aug 2025 10:46:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/osmocom-obs-sync: add email parameter
by osmith 20 Aug '25

20 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40886?usp=email ) Change subject: jobs/osmocom-obs-sync: add email parameter ...................................................................... jobs/osmocom-obs-sync: add email parameter Change-Id: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec --- M jobs/osmocom-obs-sync.yml 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/86/40886/1 diff --git a/jobs/osmocom-obs-sync.yml b/jobs/osmocom-obs-sync.yml index 399f7ff..ade61b1 100644 --- a/jobs/osmocom-obs-sync.yml +++ b/jobs/osmocom-obs-sync.yml @@ -17,6 +17,10 @@ name: CI_BRANCH description: osmo-ci.git branch default: 'master' + - string: + name: EMAIL_NOTIFICATIONS + description: For failed job notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' scm: - git: branches: @@ -52,4 +56,4 @@ publishers: - email: notify-every-unstable-build: true - recipients: 'jenkins-notifications(a)lists.osmocom.org' + recipients: '$EMAIL_NOTIFICATIONS' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40886?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: I4e9b2f474bfd3b5eb235e46475cef54e3fc17aec Gerrit-Change-Number: 40886 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ci[master]: scripts/obs/sync_obs_projects.py: format with ruff
by osmith 20 Aug '25

20 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40888?usp=email ) Change subject: scripts/obs/sync_obs_projects.py: format with ruff ...................................................................... scripts/obs/sync_obs_projects.py: format with ruff Change-Id: I1b7281b32c352b09a0641175b6f70751010800d9 --- M .ruff.toml M scripts/obs/sync_obs_projects.py 2 files changed, 96 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/88/40888/1 diff --git a/.ruff.toml b/.ruff.toml index 6f6bd68..d8e72e2 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -18,7 +18,6 @@ "scripts/obs/lib/osc.py", "scripts/obs/lib/rpm_spec.py", "scripts/obs/lib/srcpkg.py", - "scripts/obs/sync_obs_projects.py", "scripts/obs/update_obs_project.py", "scripts/osmo-depcheck/buildstack.py", "scripts/osmo-depcheck/config.py", diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index bf6b0b7..d494ed4 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -23,34 +23,57 @@ def parse_args(): - parser = argparse.ArgumentParser(description="Sync OBS projects (prjconf," - " meta) from another instance (OS#6165)") - parser.add_argument("-d", "--docker", - help="run in docker to avoid installing required pkgs", - action="store_true") - parser.add_argument("-n", "--no-skip-up-to-date", - dest="skip_up_to_date", action="store_false", - help="always assume projects are outdated") - parser.add_argument("-v", "--verbose", action="store_true", - help="always print shell commands and their output," - " instead of only printing them on error") - parser.add_argument("projects", - help="source OBS project, e.g. Debian:12", - nargs="+") + parser = argparse.ArgumentParser(description="Sync OBS projects (prjconf, meta) from another instance (OS#6165)") + parser.add_argument( + "-d", + "--docker", + help="run in docker to avoid installing required pkgs", + action="store_true", + ) + parser.add_argument( + "-n", + "--no-skip-up-to-date", + dest="skip_up_to_date", + action="store_false", + help="always assume projects are outdated", + ) + parser.add_argument( + "-v", + "--verbose", + action="store_true", + help="always print shell commands and their output, instead of only printing them on error", + ) + parser.add_argument( + "projects", + help="source OBS project, e.g. Debian:12", + nargs="+", + ) advanced = parser.add_argument_group("advanced options") - advanced.add_argument("-A", "--apiurl", help="source OBS API URL" - " (default: https://api.opensuse.org)", - default="https://api.opensuse.org") - advanced.add_argument("-p", "--prefix", default="openSUSE.org-mirror", - help="destination OBS prefix" - " (default: openSUSE.org-mirror)") - advanced.add_argument("-t", "--to-apiurl", help="destination OBS API URL" - " (default: https://obs.osmocom.org)", - default="https://obs.osmocom.org") - advanced.add_argument("-w", "--weburl", default="https://build.opensuse.org", - help="source OBS web URL (default:" - " https://build.opensuse.org)") + advanced.add_argument( + "-A", + "--apiurl", + help="source OBS API URL (default: https://api.opensuse.org)", + default="https://api.opensuse.org", + ) + advanced.add_argument( + "-p", + "--prefix", + default="openSUSE.org-mirror", + help="destination OBS prefix (default: openSUSE.org-mirror)", + ) + advanced.add_argument( + "-t", + "--to-apiurl", + help="destination OBS API URL (default: https://obs.osmocom.org)", + default="https://obs.osmocom.org", + ) + advanced.add_argument( + "-w", + "--weburl", + default="https://build.opensuse.org", + help="source OBS web URL (default: https://build.opensuse.org)", + ) args = parser.parse_args() lib.set_args(args) @@ -79,9 +102,9 @@ def generate_prjconf_header(project): - """ This header gets prepended to the prjconf, before it gets written to - the destination OBS. This script uses it to determine whether the - project needs to be updated next time it runs. """ + """This header gets prepended to the prjconf, before it gets written to + the destination OBS. This script uses it to determine whether the + project needs to be updated next time it runs.""" with open(temp_source_prjconf, "rb") as h: source_prjconf = h.read() with open(temp_source_meta, "rb") as h: @@ -128,10 +151,12 @@ if project.startswith("Raspbian:"): return ["armv7l"] - return ["aarch64", - "armv7l", - "i586", - "x86_64"] + return [ + "aarch64", + "armv7l", + "i586", + "x86_64", + ] def rewrite_meta(project): @@ -147,9 +172,11 @@ for description in root.findall("description"): href = f"{lib.args.weburl}/project/show/{project}" - description.text = ("This project gets synced from:" - f" <a href='{html.escape(href)}'>{project}</a>\n" - "Do not modify manually. See OS#6165.\n") + description.text = ( + "This project gets synced from:" + f" <a href='{html.escape(href)}'>{project}</a>\n" + "Do not modify manually. See OS#6165.\n" + ) for repository in root.findall(".repository"): repo_name = repository.get("name") @@ -188,11 +215,21 @@ url = download.get("url") print(f" changing url to https: {url}") if url.startswith("http://ftp.de.debian.org/debian"): - download.set("url", url.replace("http://ftp.de.debian.org/debian", - "https://debian.inf.tu-dresden.de/debian")) + download.set( + "url", + url.replace( + "http://ftp.de.debian.org/debian", + "https://debian.inf.tu-dresden.de/debian", + ), + ) elif url.startswith("http://security.debian.org/debian-security"): - download.set("url", url.replace("http://security.debian.org/debian-security", - "https://debian.inf.tu-dresden.de/debian-security")) + download.set( + "url", + url.replace( + "http://security.debian.org/debian-security", + "https://debian.inf.tu-dresden.de/debian-security", + ), + ) else: raise RuntimeError(f"Unexpected mirror URL: {url}") for pubkey in download.findall("pubkey"): @@ -256,11 +293,15 @@ return # Show prjconf diff (old prjconf was retrieved in is_up_to_date()) - diff = lib.run_cmd(["colordiff", - "-c3", - temp_dest_old_prjconf, - temp_dest_new_prjconf], - check=False) + diff = lib.run_cmd( + [ + "colordiff", + "-c3", + temp_dest_old_prjconf, + temp_dest_new_prjconf, + ], + check=False, + ) if diff.returncode: print(f"{project_new}: prjconf changes:") print(diff.output, end="") @@ -270,13 +311,16 @@ # Show meta diff lib.osc.get_meta(temp_dest_old_meta) for file in [temp_dest_old_meta, temp_dest_new_meta]: - lib.run_cmd(f"xmllint --format {shlex.quote(file)} > {shlex.quote(file)}.pretty", - shell=True) - diff = lib.run_cmd(["colordiff", - "-c3", - f"{temp_dest_old_meta}.pretty", - f"{temp_dest_new_meta}.pretty"], - check=False) + lib.run_cmd(f"xmllint --format {shlex.quote(file)} > {shlex.quote(file)}.pretty", shell=True) + diff = lib.run_cmd( + [ + "colordiff", + "-c3", + f"{temp_dest_old_meta}.pretty", + f"{temp_dest_new_meta}.pretty", + ], + check=False, + ) if diff.returncode: print(f"{project_new}: meta changes:") print(diff.output, end="") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40888?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: I1b7281b32c352b09a0641175b6f70751010800d9 Gerrit-Change-Number: 40888 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: OBS: sync_obs_projects: support security.d.o
by osmith 20 Aug '25

20 Aug '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40887?usp=email ) Change subject: OBS: sync_obs_projects: support security.d.o ...................................................................... OBS: sync_obs_projects: support security.d.o The Debian 13 meta config in the OpenSUSE OBS now lists security.debian.org. Adjust the script that syncs the config to support this URL too, rewrite it to HTTPS just like the other mirror URL. Fix for: changing url to https: http://security.debian.org/debian-security?dist=trixie-security&component=m… Traceback (most recent call last): File "/obs/sync_obs_projects.py", line 322, in <module> main() File "/obs/sync_obs_projects.py", line 312, in main rewrite_meta(project) File "/obs/sync_obs_projects.py", line 190, in rewrite_meta assert url.startswith("http://ftp.de.debian.org/debian"), \ AssertionError: unexpected mirror URL Related: https://build.opensuse.org/projects/Debian:13/meta Change-Id: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 --- M scripts/obs/sync_obs_projects.py 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/40887/1 diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index 732fa02..bf6b0b7 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -187,10 +187,14 @@ for download in repository.findall(".download"): url = download.get("url") print(f" changing url to https: {url}") - assert url.startswith("http://ftp.de.debian.org/debian"), \ - "unexpected mirror URL" - download.set("url", url.replace("http://ftp.de.debian.org/debian", - "https://debian.inf.tu-dresden.de/debian")) + if url.startswith("http://ftp.de.debian.org/debian"): + download.set("url", url.replace("http://ftp.de.debian.org/debian", + "https://debian.inf.tu-dresden.de/debian")) + elif url.startswith("http://security.debian.org/debian-security"): + download.set("url", url.replace("http://security.debian.org/debian-security", + "https://debian.inf.tu-dresden.de/debian-security")) + else: + raise RuntimeError(f"Unexpected mirror URL: {url}") for pubkey in download.findall("pubkey"): download.remove(pubkey) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40887?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: Iaf6a025376e398e26c5031b07fee6c1f64cbe047 Gerrit-Change-Number: 40887 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2025