Skip to content

CLOS-4056: leapp-data support for no-auth CloudLinux repository scheme #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prilr wants to merge 4 commits into
base: cloudlinux
Choose a base branch
from
Open

CLOS-4056: leapp-data support for no-auth CloudLinux repository scheme #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89d0d7b
CLOS-4056: add CL no-auth repos to el9 repomap and upgrade repos
prilr Apr 24, 2026
906453f
CLOS-4056: add CL no-auth repos to el8 repomap and upgrade repos
prilr Apr 24, 2026
5728e25
CLOS-4056: rename stanza repoid cl-channel -> cloudlinux{8,9}-channel
prilr Apr 24, 2026
729d048
Narrow down upgrade repo comments
prilr Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions files/cloudlinux/leapp_upgrade_repositories.repo.el8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,50 @@ gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

# CL repositories used during migration.
# Enabled so CloudLinux-specific packages are available when the source system
# is on the no-auth scheme and CLN is no longer serving them.

# 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
38 changes: 27 additions & 11 deletions files/cloudlinux/leapp_upgrade_repositories.repo.el9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,36 @@ 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 are available when the source system
# is on the no-auth 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,
# 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
23 changes: 21 additions & 2 deletions files/cloudlinux/repomap.json.el8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
{
"source": "cloudlinux-base",
"target": [
"cloudlinux8-channel",
"cloudlinux8-baseos",
"cloudlinux8-appstream",
"cloudlinux8-powertools"
Expand All @@ -21,6 +22,7 @@
{
"source": "cloudlinux-updates",
"target": [
"cloudlinux8-channel",
"cloudlinux8-baseos",
"cloudlinux8-appstream",
"cloudlinux8-powertools"
Expand All @@ -29,6 +31,7 @@
{
"source": "cloudlinux-hybrid-updates",
"target": [
"cloudlinux8-channel",
"cloudlinux8-baseos",
"cloudlinux8-appstream",
"cloudlinux8-powertools"
Expand Down Expand Up @@ -56,11 +59,14 @@
},
{
"source": "extras",
"target": ["almalinux8-extras"]
"target": [
"almalinux8-extras"
]
},
{
"source": "cloudlinux-extras",
"target": [
"cloudlinux8-channel",
"cloudlinux8-baseos",
"cloudlinux8-appstream",
"cloudlinux8-powertools",
Expand All @@ -70,7 +76,8 @@
{
"source": "cloudlinux-elevate",
"target": [
"cloudlinux8-elevate"
"cloudlinux8-elevate",
"cloudlinux8-channel"
]
}
]
Expand Down Expand Up @@ -292,6 +299,18 @@
"channel": "ga"
}
]
},
{
"pesid": "cloudlinux8-channel",
"entries": [
{
"major_version": "8",
"repo_type": "rpm",
"repoid": "cloudlinux8-channel",
"arch": "x86_64",
"channel": "ga"
}
]
}
]
}
130 changes: 130 additions & 0 deletions files/cloudlinux/repomap.json.el9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
]
}
Expand Down Expand Up @@ -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"
}
]
}
]
}