diff options
Diffstat (limited to 'buildscripts/packager_enterprise.py')
| -rwxr-xr-x | buildscripts/packager_enterprise.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index 3e2ec6addd1..fcc260c86be 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -44,7 +44,7 @@ import packager # pylint: disable=wrong-import-position ARCH_CHOICES = ["x86_64", "ppc64le", "s390x", "arm64", "aarch64"] # Made up names for the flavors of distribution we package for. -DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2", "amazon2023"] +DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2"] class EnterpriseSpec(packager.Spec): @@ -119,7 +119,7 @@ class EnterpriseDistro(packager.Distro): def build_os(self, arch): # pylint: disable=too-many-branches """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", "rhel80" are for redhat, the others are delegated to the super class. """ # pylint: disable=too-many-return-statements @@ -139,18 +139,16 @@ class EnterpriseDistro(packager.Distro): return [] if arch == "arm64": if self.dname == 'ubuntu': - return ["ubuntu1804", "ubuntu2004", "ubuntu2204"] + return ["ubuntu1804", "ubuntu2004"] if arch == "aarch64": if self.dname == 'redhat': - return ["rhel82", "rhel90"] + return ["rhel82"] if self.dname == 'amazon2': return ["amazon2"] - if self.dname == 'amazon2023': - return ["amazon2023"] return [] if re.search("(redhat|fedora|centos)", self.dname): - return ["rhel90", "rhel80", "rhel70", "rhel62", "rhel57"] + return ["rhel80", "rhel70", "rhel62", "rhel57"] return super(EnterpriseDistro, self).build_os(arch) # pylint: enable=too-many-return-statements |