SERVER-87110 Add rhel79 as a valid distro in packager.py (#19325)

GitOrigin-RevId: ff5351f141599e0ea81d4bf23c2c5493a3d6b29f
This commit is contained in:
Zack Winter 2024-02-27 17:12:16 -08:00 committed by MongoDB Bot
parent 77063491da
commit f711eed5f4
5 changed files with 8 additions and 4 deletions

View File

@ -99,6 +99,9 @@ OS_DOCKER_LOOKUP = {
'rhel72': ('centos:7', "yum",
frozenset(["rh-python38.x86_64", "wget", "pkgconfig", "systemd", "procps", "file"]),
"/opt/rh/rh-python38/root/usr/bin/python3"),
'rhel79': ('centos:7', "yum",
frozenset(["rh-python38.x86_64", "wget", "pkgconfig", "systemd", "procps", "file"]),
"/opt/rh/rh-python38/root/usr/bin/python3"),
'rhel80': ('almalinux:8', "yum",
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
'rhel81': ('almalinux:8', "yum",

View File

@ -352,6 +352,7 @@ class Distro(object):
"rhel70",
"rhel71",
"rhel72",
"rhel79",
"rhel62",
"rhel55",
"rhel67",

View File

@ -120,7 +120,7 @@ class EnterpriseDistro(packager.Distro):
def build_os(self, arch):
"""Return the build os label in the binary package to download.
The labels "rhel57", "rhel62", "rhel67", "rhel70", "rhel80", "rhel90" are for redhat,
The labels "rhel57", "rhel62", "rhel67", "rhel70", "rhel79", "rhel80", "rhel90" are for redhat,
the others are delegated to the super class.
"""
if arch == "ppc64le":
@ -150,7 +150,7 @@ class EnterpriseDistro(packager.Distro):
return []
if re.search("(redhat|fedora|centos)", self.dname):
return ["rhel90", "rhel80", "rhel70", "rhel62", "rhel57"]
return ["rhel90", "rhel80", "rhel70", "rhel79", "rhel62", "rhel57"]
return super(EnterpriseDistro, self).build_os(arch)

View File

@ -30,7 +30,7 @@ buildvariants:
has_packages: true
packager_script: packager_enterprise.py
packager_arch: x86_64
packager_distro: rhel7.9-small
packager_distro: rhel79
repo_edition: enterprise
scons_cache_scope: shared
compile_variant: enterprise-rhel-79-64-bit

View File

@ -134,7 +134,7 @@ variables:
has_packages: true
packager_script: packager_enterprise.py
packager_arch: x86_64
packager_distro: rhel7.9-small
packager_distro: rhel79
repo_edition: enterprise
scons_cache_scope: shared
core_analyzer_distro_name: rhel7.9-large