From db6f9d43dc9ac54473c6968f96015e0b186102c3 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 18 Jun 2024 10:46:59 +0300 Subject: [PATCH 1/3] Clean up: Remove old distro entries from Schutzfile - centos-stream-8 - fedora-37 and fedora-38 - rhel-8.6, rhel-8.7 and rhel-8.8 - rhel-9.0 and rhel-9.1 Not used anymore, removing to reduce the bulk of this file and make it easier for subsequent edits --- Schutzfile | 370 ----------------------------------------------------- 1 file changed, 370 deletions(-) diff --git a/Schutzfile b/Schutzfile index 1eb6857d..c86d3043 100644 --- a/Schutzfile +++ b/Schutzfile @@ -9,116 +9,6 @@ } } }, - "fedora-37": { - "repos": [ - { - "file": "/etc/yum.repos.d/fedora.repo", - "x86_64": [ - { - "title": "fedora", - "name": "fedora", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20221115/" - } - ], - "aarch64": [ - { - "title": "fedora", - "name": "fedora", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221115/" - } - ] - }, - { - "file": "/etc/yum.repos.d/fedora-modular.repo", - "x86_64": [ - { - "title": "fedora-modular", - "name": "fedora-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-modular-development-20221115/" - } - ], - "aarch64": [ - { - "title": "fedora-modular", - "name": "fedora-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-modular-development-20221115/" - } - ] - }, - { - "file": "/etc/yum.repos.d/fedora-updates.repo", - "x86_64": [ - { - "title": "updates", - "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-development-20221115/" - } - ], - "aarch64": [ - { - "title": "updates", - "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221115/" - } - ] - }, - { - "file": "/etc/yum.repos.d/fedora-updates-modular.repo", - "x86_64": [ - { - "title": "updates-modular", - "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-fedora-modular-development-20221115/" - } - ], - "aarch64": [ - { - "title": "updates-modular", - "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-modular-development-20221115/" - } - ] - } - ] - }, - "fedora-38": { - "repos": [ - { - "file": "/etc/yum.repos.d/fedora.repo", - "x86_64": [ - { - "title": "fedora", - "name": "fedora", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-branched-20230418" - } - ], - "aarch64": [ - { - "title": "fedora", - "name": "fedora", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-branched-20230418" - } - ] - }, - { - "file": "/etc/yum.repos.d/fedora-modular.repo", - "x86_64": [ - { - "title": "fedora-modular", - "name": "fedora-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-branched-modular-20230418" - } - ], - "aarch64": [ - { - "title": "fedora-modular", - "name": "fedora-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-branched-modular-20230418" - } - ] - } - ] - }, "fedora-39": { "repos": [ { @@ -198,129 +88,6 @@ } ] }, - "rhel-8.6": { - "repos": [ - { - "file": "/etc/yum.repos.d/rhel8internal.repo", - "x86_64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220829" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220829" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.6-20220829" - } - ], - "aarch64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.6-20220829" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.6-20220829" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.6-20220829" - } - ] - } - ] - }, - "rhel-8.7": { - "repos": [ - { - "file": "/etc/yum.repos.d/rhel8internal.repo", - "x86_64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221115" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221115" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.7-20221115" - } - ], - "aarch64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.7-20221115" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.7-20221115" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.7-20221115" - } - ] - } - ] - }, - "rhel-8.8": { - "repos": [ - { - "file": "/etc/yum.repos.d/rhel8internal.repo", - "x86_64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20230808" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20230808" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.8-20230808" - } - ], - "aarch64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.8-20230808" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.8-20230808" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.8-20230808" - } - ] - } - ] - }, "rhel-8.10": { "repos": [ { @@ -362,88 +129,6 @@ } ] }, - "rhel-9.0": { - "repos": [ - { - "file": "/etc/yum.repos.d/rhel9internal.repo", - "x86_64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220829" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220829" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.0-20220829" - } - ], - "aarch64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220829" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220829" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.0-20220829" - } - ] - } - ] - }, - "rhel-9.1": { - "repos": [ - { - "file": "/etc/yum.repos.d/rhel9internal.repo", - "x86_64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.1-20221115" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.1-20221115" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.1-20221115" - } - ], - "aarch64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.1-20221115" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.1-20221115" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.1-20221115" - } - ] - } - ] - }, "rhel-9.4": { "repos": [ { @@ -525,60 +210,5 @@ ] } ] - }, - "centos-stream-8": { - "repos": [ - { - "file": "/etc/yum.repos.d/CentOS-Stream-BaseOS.repo", - "x86_64": [ - { - "title": "baseos", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20240101" - } - ], - "aarch64": [ - { - "title": "baseos", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20240101" - } - ] - }, - { - "file": "/etc/yum.repos.d/CentOS-Stream-AppStream.repo", - "x86_64": [ - { - "title": "appstream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20240101" - } - ], - "aarch64": [ - { - "title": "appstream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20240101" - } - ] - }, - { - "file": "/etc/yum.repos.d/CentOS-Stream-PowerTools.repo", - "x86_64": [ - { - "title": "powertools", - "name": "powertools", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20240101" - } - ], - "aarch64": [ - { - "title": "powertools", - "name": "powertools", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20240101" - } - ] - } - ] } } From e9c2d34589a6cab2cf5a632cdd3ed1a0cb504559 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 18 Jun 2024 10:54:31 +0300 Subject: [PATCH 2/3] Update snapshots in Schutzfile - fedora-39 matchs osbuild-composer - centos-stream-9 matches osbuild & osbuild-composer - rhel-8.10 matchs osbuild & osbuild-composer - rhel-9.4 to matches osbuild & osbuild-composer - rhel-9.5 already matches osbuild-composer --- Schutzfile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Schutzfile b/Schutzfile index c86d3043..b65a9b65 100644 --- a/Schutzfile +++ b/Schutzfile @@ -34,14 +34,14 @@ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-x86_64-updates-released-20231127" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-x86_64-updates-released-20240514" } ], "aarch64": [ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-updates-released-20231127" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-updates-released-20240514" } ] } @@ -55,34 +55,34 @@ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20240514" }, { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20240514" }, { "title": "crb", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20240514" } ], "aarch64": [ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20240514" }, { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20240514" }, { "title": "crb", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20240514" } ] } @@ -96,34 +96,34 @@ { "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.10-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.10-20240514" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20240514" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20240514" } ], "aarch64": [ { "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20240514" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20240514" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20240514" } ] } @@ -137,34 +137,34 @@ { "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.4-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.4-20240514" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240514" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240514" } ], "aarch64": [ { "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240514" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240514" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240101" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240514" } ] } From de6db919d706a58d0e3b08194cf0e1055b011c67 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 18 Jun 2024 11:04:09 +0300 Subject: [PATCH 3/3] Use the latest commits from osbuild & osbuild-composer --- Schutzfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Schutzfile b/Schutzfile index b65a9b65..6e3a9d99 100644 --- a/Schutzfile +++ b/Schutzfile @@ -2,10 +2,10 @@ "global": { "dependencies": { "osbuild": { - "commit": "faaa0bf50830c64f0f2696b5cc74d0f71663559d" + "commit": "92e5e437947e52ec2cfb463d50e403b1317b4215" }, "osbuild-composer": { - "commit": "c80ca0a64d269dd653141dc2121c1133fd0768ed" + "commit": "ae4467ab0d551ba2a972a6ce55b601cbc35f36b5" } } },