diff --git a/files/cloudlinux/leapp_upgrade_repositories.repo.el8 b/files/cloudlinux/leapp_upgrade_repositories.repo.el8 index 50689fd..4bd9e85 100644 --- a/files/cloudlinux/leapp_upgrade_repositories.repo.el8 +++ b/files/cloudlinux/leapp_upgrade_repositories.repo.el8 @@ -49,19 +49,52 @@ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux # CL repositories used during migration. +# Enabled so CloudLinux-specific packages (cagefs, alt-php*, lve-utils, etc.) +# are available when the target CL8 system uses the no-auth (SWNG) scheme +# and CLN is no longer serving them. Mirrors the el9 setup. +# cloudlinux8-channel is the primary CL8 no-auth repo (SWNG mirrorlist) we +# provide for the upgrade transaction. It carries the full CL8 package set. +# +# Note: we use the distinct repoid "cloudlinux8-channel" (not "cl-channel") +# so it does not clash with a runtime "cl-channel" repo if the source system +# (or a mixed-state CL7 host) already defines one in /etc/yum.repos.d/. The +# corresponding pesid in repomap.json.el8 maps cloudlinux8-channel -> this +# repoid for CL7 sources. +[cloudlinux8-channel] +name=CloudLinux 8 - SWNG mirrorlist +mirrorlist=https://repo.cloudlinux.com/cloudlinux/mirrorlists/cl-mirrors/cloudlinux-x86_64-server-8 +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux + +# Narrower BaseOS/AppStream/PowerTools static repos (CDN-served). Smaller +# slices of the package set; cl-channel above is the authoritative source. +# Kept as backups when the mirrorlist is unreachable. [cloudlinux8-baseos] name=CloudLinux 8 - BaseOS baseurl=https://repo.cloudlinux.com/cloudlinux/8/BaseOS/$basearch/os/ -# keep cloudlinux8-baseos here because we need repository to install rhn-client-tools -# but at the same time we don't want to use it during migration because we have CLN channel -enabled=0 +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux + +[cloudlinux8-appstream] +name=CloudLinux 8 - AppStream +baseurl=https://repo.cloudlinux.com/cloudlinux/8/AppStream/$basearch/os/ +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux + +[cloudlinux8-powertools] +name=CloudLinux 8 - PowerTools +baseurl=https://repo.cloudlinux.com/cloudlinux/8/PowerTools/$basearch/os/ +enabled=1 gpgcheck=1 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux [cloudlinux8-elevate] name=CloudLinux 8 ELevate baseurl=https://repo.cloudlinux.com/elevate/8/$basearch/ -gpgcheck=1 enabled=1 +gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux diff --git a/files/cloudlinux/leapp_upgrade_repositories.repo.el9 b/files/cloudlinux/leapp_upgrade_repositories.repo.el9 index 4faaa75..47b22fb 100644 --- a/files/cloudlinux/leapp_upgrade_repositories.repo.el9 +++ b/files/cloudlinux/leapp_upgrade_repositories.repo.el9 @@ -81,20 +81,38 @@ gpgcheck=1 gpgkey=file:///etc/leapp/repos.d/system_upgrade/common/files/rpm-gpg/9/RPM-GPG-KEY-AlmaLinux-9 # CL repositories used during migration. +# Enabled so CloudLinux-specific packages (cagefs, alt-php*, lve-utils, etc.) +# are available when the source system is on the no-auth (SWNG) scheme and +# CLN is no longer serving them. +# cloudlinux9-channel is the primary CL9 no-auth repo (SWNG mirrorlist) we +# provide for the upgrade transaction. It carries the full CL9 package set. +# +# Note: we use the distinct repoid "cloudlinux9-channel" (not "cl-channel") +# to avoid clashing with the runtime "cl-channel" repo from the source +# system's /etc/yum.repos.d/cl.repo (CL8), which is carried into the target +# upgrade container and would otherwise trigger the +# "YUM/DNF repository defined multiple times" inhibitor. +[cloudlinux9-channel] +name=CloudLinux 9 - SWNG mirrorlist +mirrorlist=https://repo.cloudlinux.com/cloudlinux/mirrorlists/cl-mirrors/cloudlinux-x86_64-server-9 +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux + +# Narrower BaseOS/AppStream static repos (CDN-served, no mirrorlist). These are +# smaller slices of the package set; cl-channel above is the authoritative +# source. Kept as backups for cases where the mirrorlist is unreachable. [cloudlinux9-baseos] name=CloudLinux 9 - BaseOS baseurl=https://repo.cloudlinux.com/cloudlinux/9/BaseOS/$basearch/os/ -# keep cloudlinux9-baseos here because we need repository to install rhn-client-tools -# but at the same time we don't want to use it during migration because we have CLN channel -enabled=0 +enabled=1 gpgcheck=1 -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux -# todo: is it needed at all? -# [cloudlinux9-elevate] -# name=CloudLinux 9 ELevate -# baseurl=https://repo.cloudlinux.com/elevate/9/$basearch/ -# gpgcheck=1 -# enabled=1 -# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux +[cloudlinux9-appstream] +name=CloudLinux 9 - AppStream +baseurl=https://repo.cloudlinux.com/cloudlinux/9/AppStream/$basearch/os/ +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CloudLinux diff --git a/files/cloudlinux/repomap.json.el8 b/files/cloudlinux/repomap.json.el8 index f0cab35..c2f61ec 100644 --- a/files/cloudlinux/repomap.json.el8 +++ b/files/cloudlinux/repomap.json.el8 @@ -13,6 +13,7 @@ { "source": "cloudlinux-base", "target": [ + "cloudlinux8-channel", "cloudlinux8-baseos", "cloudlinux8-appstream", "cloudlinux8-powertools" @@ -21,6 +22,7 @@ { "source": "cloudlinux-updates", "target": [ + "cloudlinux8-channel", "cloudlinux8-baseos", "cloudlinux8-appstream", "cloudlinux8-powertools" @@ -29,6 +31,7 @@ { "source": "cloudlinux-hybrid-updates", "target": [ + "cloudlinux8-channel", "cloudlinux8-baseos", "cloudlinux8-appstream", "cloudlinux8-powertools" @@ -56,11 +59,14 @@ }, { "source": "extras", - "target": ["almalinux8-extras"] + "target": [ + "almalinux8-extras" + ] }, { "source": "cloudlinux-extras", "target": [ + "cloudlinux8-channel", "cloudlinux8-baseos", "cloudlinux8-appstream", "cloudlinux8-powertools", @@ -70,7 +76,8 @@ { "source": "cloudlinux-elevate", "target": [ - "cloudlinux8-elevate" + "cloudlinux8-elevate", + "cloudlinux8-channel" ] } ] @@ -292,6 +299,18 @@ "channel": "ga" } ] + }, + { + "pesid": "cloudlinux8-channel", + "entries": [ + { + "major_version": "8", + "repo_type": "rpm", + "repoid": "cloudlinux8-channel", + "arch": "x86_64", + "channel": "ga" + } + ] } ] } diff --git a/files/cloudlinux/repomap.json.el9 b/files/cloudlinux/repomap.json.el9 index 7c162be..a5995e8 100644 --- a/files/cloudlinux/repomap.json.el9 +++ b/files/cloudlinux/repomap.json.el9 @@ -68,6 +68,40 @@ "target": [ "almalinux9-saphana" ] + }, + { + "source": "cl-channel", + "target": [ + "cloudlinux9-channel", + "cloudlinux9-baseos", + "cloudlinux9-appstream" + ] + }, + { + "source": "cloudlinux8-baseos", + "target": [ + "cloudlinux9-channel", + "cloudlinux9-baseos" + ] + }, + { + "source": "cloudlinux8-appstream", + "target": [ + "cloudlinux9-channel", + "cloudlinux9-appstream" + ] + }, + { + "source": "cloudlinux8-powertools", + "target": [ + "cloudlinux9-channel" + ] + }, + { + "source": "cloudlinux8-elevate", + "target": [ + "cloudlinux9-channel" + ] } ] } @@ -312,6 +346,102 @@ "channel": "ga" } ] + }, + { + "pesid": "cl-channel", + "entries": [ + { + "major_version": "8", + "repo_type": "rpm", + "repoid": "cl-channel", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux8-baseos", + "entries": [ + { + "major_version": "8", + "repo_type": "rpm", + "repoid": "cloudlinux8-baseos", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux8-appstream", + "entries": [ + { + "major_version": "8", + "repo_type": "rpm", + "repoid": "cloudlinux8-appstream", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux8-powertools", + "entries": [ + { + "major_version": "8", + "repo_type": "rpm", + "repoid": "cloudlinux8-powertools", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux8-elevate", + "entries": [ + { + "major_version": "8", + "repo_type": "rpm", + "repoid": "cloudlinux8-elevate", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux9-baseos", + "entries": [ + { + "major_version": "9", + "repo_type": "rpm", + "repoid": "cloudlinux9-baseos", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux9-appstream", + "entries": [ + { + "major_version": "9", + "repo_type": "rpm", + "repoid": "cloudlinux9-appstream", + "arch": "x86_64", + "channel": "ga" + } + ] + }, + { + "pesid": "cloudlinux9-channel", + "entries": [ + { + "major_version": "9", + "repo_type": "rpm", + "repoid": "cloudlinux9-channel", + "arch": "x86_64", + "channel": "ga" + } + ] } ] }