mirror of https://github.com/mongodb/mongo
SERVER-89636 Amend package_test to permit use of rhel88, rhel93, and ubuntu2404 (#21328)
GitOrigin-RevId: 7e753bb43fc853c835078dbfdbbf5939e05ea3f1
This commit is contained in:
parent
2f14a59ff7
commit
8df722b9f6
|
|
@ -110,8 +110,12 @@ OS_DOCKER_LOOKUP = {
|
||||||
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
||||||
'rhel83': ('almalinux:8', "yum",
|
'rhel83': ('almalinux:8', "yum",
|
||||||
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
||||||
|
'rhel88': ('almalinux:8', "yum",
|
||||||
|
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
||||||
'rhel90': ('almalinux:9', "yum",
|
'rhel90': ('almalinux:9', "yum",
|
||||||
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
||||||
|
'rhel93': ('almalinux:9', "yum",
|
||||||
|
frozenset(["python3", "wget", "pkgconfig", "systemd", "procps", "file"]), "python3"),
|
||||||
'sunos5': None,
|
'sunos5': None,
|
||||||
'suse11': None,
|
'suse11': None,
|
||||||
'suse12': None,
|
'suse12': None,
|
||||||
|
|
@ -140,6 +144,11 @@ OS_DOCKER_LOOKUP = {
|
||||||
"python3", "python-is-python3", "wget", "pkg-config", "systemd", "procps",
|
"python3", "python-is-python3", "wget", "pkg-config", "systemd", "procps",
|
||||||
"file"
|
"file"
|
||||||
]), "python3"),
|
]), "python3"),
|
||||||
|
'ubuntu2404': ('ubuntu:24.04', "apt",
|
||||||
|
frozenset([
|
||||||
|
"python3", "python-is-python3", "wget", "pkg-config", "systemd", "procps",
|
||||||
|
"file"
|
||||||
|
]), "python3"),
|
||||||
'windows': None,
|
'windows': None,
|
||||||
'windows_i686': None,
|
'windows_i686': None,
|
||||||
'windows_x86_64': None,
|
'windows_x86_64': None,
|
||||||
|
|
|
||||||
|
|
@ -305,6 +305,8 @@ class Distro(object):
|
||||||
return "focal"
|
return "focal"
|
||||||
elif build_os == 'ubuntu2204':
|
elif build_os == 'ubuntu2204':
|
||||||
return "jammy"
|
return "jammy"
|
||||||
|
elif build_os == 'ubuntu2404':
|
||||||
|
return "noble"
|
||||||
else:
|
else:
|
||||||
raise Exception("unsupported build_os: %s" % build_os)
|
raise Exception("unsupported build_os: %s" % build_os)
|
||||||
elif self.dname == 'debian':
|
elif self.dname == 'debian':
|
||||||
|
|
@ -346,7 +348,9 @@ class Distro(object):
|
||||||
return ["suse11", "suse12", "suse15"]
|
return ["suse11", "suse12", "suse15"]
|
||||||
elif re.search("(redhat|fedora|centos)", self.dname):
|
elif re.search("(redhat|fedora|centos)", self.dname):
|
||||||
return [
|
return [
|
||||||
|
"rhel93",
|
||||||
"rhel90",
|
"rhel90",
|
||||||
|
"rhel88",
|
||||||
"rhel82",
|
"rhel82",
|
||||||
"rhel80",
|
"rhel80",
|
||||||
"rhel70",
|
"rhel70",
|
||||||
|
|
@ -367,6 +371,7 @@ class Distro(object):
|
||||||
"ubuntu1804",
|
"ubuntu1804",
|
||||||
"ubuntu2004",
|
"ubuntu2004",
|
||||||
"ubuntu2204",
|
"ubuntu2204",
|
||||||
|
"ubuntu2404",
|
||||||
]
|
]
|
||||||
elif self.dname == 'debian':
|
elif self.dname == 'debian':
|
||||||
return ["debian81", "debian92", "debian10", "debian11", "debian12"]
|
return ["debian81", "debian92", "debian10", "debian11", "debian12"]
|
||||||
|
|
|
||||||
|
|
@ -139,10 +139,10 @@ class EnterpriseDistro(packager.Distro):
|
||||||
return []
|
return []
|
||||||
if arch == "arm64":
|
if arch == "arm64":
|
||||||
if self.dname == 'ubuntu':
|
if self.dname == 'ubuntu':
|
||||||
return ["ubuntu1804", "ubuntu2004", "ubuntu2204"]
|
return ["ubuntu1804", "ubuntu2004", "ubuntu2204", "ubuntu2404"]
|
||||||
if arch == "aarch64":
|
if arch == "aarch64":
|
||||||
if self.dname == 'redhat':
|
if self.dname == 'redhat':
|
||||||
return ["rhel82", "rhel90"]
|
return ["rhel82", "rhel88", "rhel90", "rhel93"]
|
||||||
if self.dname == 'amazon2':
|
if self.dname == 'amazon2':
|
||||||
return ["amazon2"]
|
return ["amazon2"]
|
||||||
if self.dname == 'amazon2023':
|
if self.dname == 'amazon2023':
|
||||||
|
|
@ -150,7 +150,7 @@ class EnterpriseDistro(packager.Distro):
|
||||||
return []
|
return []
|
||||||
|
|
||||||
if re.search("(redhat|fedora|centos)", self.dname):
|
if re.search("(redhat|fedora|centos)", self.dname):
|
||||||
return ["rhel90", "rhel80", "rhel70", "rhel79", "rhel62", "rhel57"]
|
return ["rhel90", "rhel93", "rhel80", "rhel70", "rhel79", "rhel62", "rhel57", "rhel88"]
|
||||||
return super(EnterpriseDistro, self).build_os(arch)
|
return super(EnterpriseDistro, self).build_os(arch)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,15 @@ repos:
|
||||||
repos:
|
repos:
|
||||||
- yum/redhat/8/mongodb-org
|
- yum/redhat/8/mongodb-org
|
||||||
- yum/redhat/8Server/mongodb-org
|
- yum/redhat/8Server/mongodb-org
|
||||||
|
|
||||||
|
- name: rhel88
|
||||||
|
type: rpm
|
||||||
|
edition: org
|
||||||
|
bucket: repo.mongodb.org
|
||||||
|
repos:
|
||||||
|
- yum/redhat/8/mongodb-org
|
||||||
|
- yum/redhat/8Server/mongodb-org
|
||||||
|
|
||||||
- name: rhel90
|
- name: rhel90
|
||||||
type: rpm
|
type: rpm
|
||||||
edition: org
|
edition: org
|
||||||
|
|
@ -119,6 +128,14 @@ repos:
|
||||||
- yum/redhat/9/mongodb-org
|
- yum/redhat/9/mongodb-org
|
||||||
- yum/redhat/9Server/mongodb-org
|
- yum/redhat/9Server/mongodb-org
|
||||||
|
|
||||||
|
- name: rhel93
|
||||||
|
type: rpm
|
||||||
|
edition: org
|
||||||
|
bucket: repo.mongodb.org
|
||||||
|
repos:
|
||||||
|
- yum/redhat/9/mongodb-org
|
||||||
|
- yum/redhat/9Server/mongodb-org
|
||||||
|
|
||||||
- name: amazon
|
- name: amazon
|
||||||
type: rpm
|
type: rpm
|
||||||
edition: org
|
edition: org
|
||||||
|
|
@ -292,6 +309,18 @@ repos:
|
||||||
repos:
|
repos:
|
||||||
- apt/ubuntu/dists/jammy/mongodb-org
|
- apt/ubuntu/dists/jammy/mongodb-org
|
||||||
|
|
||||||
|
- name: ubuntu2404
|
||||||
|
type: deb
|
||||||
|
code_name: "noble"
|
||||||
|
edition: org
|
||||||
|
bucket: repo.mongodb.org
|
||||||
|
component: multiverse
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
- arm64
|
||||||
|
repos:
|
||||||
|
- apt/ubuntu/dists/noble/mongodb-org
|
||||||
|
|
||||||
####################
|
####################
|
||||||
#
|
#
|
||||||
# Enterprise Repos:
|
# Enterprise Repos:
|
||||||
|
|
@ -378,6 +407,14 @@ repos:
|
||||||
- yum/redhat/8/mongodb-enterprise
|
- yum/redhat/8/mongodb-enterprise
|
||||||
- yum/redhat/8Server/mongodb-enterprise
|
- yum/redhat/8Server/mongodb-enterprise
|
||||||
|
|
||||||
|
- name: rhel88
|
||||||
|
type: rpm
|
||||||
|
edition: enterprise
|
||||||
|
bucket: repo.mongodb.com
|
||||||
|
repos:
|
||||||
|
- yum/redhat/8/mongodb-enterprise
|
||||||
|
- yum/redhat/8Server/mongodb-enterprise
|
||||||
|
|
||||||
- name: rhel90
|
- name: rhel90
|
||||||
type: rpm
|
type: rpm
|
||||||
edition: enterprise
|
edition: enterprise
|
||||||
|
|
@ -386,6 +423,14 @@ repos:
|
||||||
- yum/redhat/9/mongodb-enterprise
|
- yum/redhat/9/mongodb-enterprise
|
||||||
- yum/redhat/9Server/mongodb-enterprise
|
- yum/redhat/9Server/mongodb-enterprise
|
||||||
|
|
||||||
|
- name: rhel93
|
||||||
|
type: rpm
|
||||||
|
edition: enterprise
|
||||||
|
bucket: repo.mongodb.com
|
||||||
|
repos:
|
||||||
|
- yum/redhat/9/mongodb-enterprise
|
||||||
|
- yum/redhat/9Server/mongodb-enterprise
|
||||||
|
|
||||||
- name: amazon
|
- name: amazon
|
||||||
type: rpm
|
type: rpm
|
||||||
edition: enterprise
|
edition: enterprise
|
||||||
|
|
@ -568,3 +613,15 @@ repos:
|
||||||
- arm64
|
- arm64
|
||||||
repos:
|
repos:
|
||||||
- apt/ubuntu/dists/jammy/mongodb-enterprise
|
- apt/ubuntu/dists/jammy/mongodb-enterprise
|
||||||
|
|
||||||
|
- name: ubuntu2404
|
||||||
|
type: deb
|
||||||
|
code_name: "noble"
|
||||||
|
edition: enterprise
|
||||||
|
bucket: repo.mongodb.com
|
||||||
|
component: multiverse
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
- arm64
|
||||||
|
repos:
|
||||||
|
- apt/ubuntu/dists/noble/mongodb-enterprise
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue