fix(install): Ubuntu MaxScale apt repo (#1740), AlmaLinux 10 prereqs (#1736)

- Add install_utils.strip_mariadb_maxscale_apt_repos() after mariadb_repo_setup
  so noble/jammy apt-get update succeeds (GH usmannasir/cyberpanel#1740).
- AlmaLinux 10: skip early return after universal fixes; add is_almalinux10,
  fix_almalinux10_mariadb (EPEL, CRB, MariaDB.org repo, maxscale disable).
- EL10 maps to rhel9 for OLS custom binary URLs until el10 builds exist.
- Mirror MaxScale strip in install.py _attemptMariaDBUpgrade Ubuntu path.
This commit is contained in:
master3395
2026-03-26 01:04:48 +01:00
parent 80de7fe237
commit aa0567f2af
3 changed files with 111 additions and 3 deletions

View File

@@ -38,6 +38,7 @@ def get_Ubuntu_code_name():
return "xenial"
# Using shared function from install_utils
FetchCloudLinuxAlmaVersionVersion = install_utils.FetchCloudLinuxAlmaVersionVersion
@@ -996,9 +997,11 @@ deb [arch=amd64,arm64,ppc64el,s390x signed-by=/usr/share/keyrings/mariadb-keyrin
install_utils.writeToFile("Manual MariaDB repository configuration completed.")
# GH #1740: strip broken MaxScale apt entries after mariadb_repo_setup (noble/jammy+)
if get_Ubuntu_release() > 21.00:
install_utils.strip_mariadb_maxscale_apt_repos()
command = 'DEBIAN_FRONTEND=noninteractive apt-get update -y'
command = 'DEBIAN_FRONTEND=noninteractive apt-get update -y'
install_utils.call(command, self.distro, command, command, 1, 1, os.EX_OSERR, True)