]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
script/build-with-container: add rocky10 to built-in distros
authorJohn Mulligan <jmulligan@redhat.com>
Fri, 20 Jun 2025 23:03:22 +0000 (19:03 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Thu, 31 Jul 2025 16:16:23 +0000 (12:16 -0400)
Add "rocky10" (also aliased to "rockylinux10") to the known distro bases
so that the team can begin to experiment with the Rocky Linux 10 distro
for containerized builds.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 33b33ff129011d71dcbe94fe4b2bb790f98301ad)
(cherry picked from commit 9958d46b130e175fb94569f975815edfd7348599)

src/script/build-with-container.py

index 92d8419059e0aa3ef7ea2454239d6188a6e8566e..29170e0daa4ace8caa872c14fc5e7cc5fea296be 100755 (executable)
@@ -96,12 +96,19 @@ class DistroKind(StrEnum):
     CENTOS8 = "centos8"
     CENTOS9 = "centos9"
     FEDORA41 = "fedora41"
+    ROCKY10 = "rocky10"
     UBUNTU2204 = "ubuntu22.04"
     UBUNTU2404 = "ubuntu24.04"
 
     @classmethod
     def uses_dnf(cls):
-        return {cls.CENTOS8, cls.CENTOS9, cls.CENTOS10, cls.FEDORA41}
+        return {
+            cls.CENTOS10,
+            cls.CENTOS8,
+            cls.CENTOS9,
+            cls.FEDORA41,
+            cls.ROCKY10,
+        }
 
     @classmethod
     def uses_rpmbuild(cls):
@@ -119,6 +126,8 @@ class DistroKind(StrEnum):
             "centos9stream": cls.CENTOS9,
             str(cls.FEDORA41): cls.FEDORA41,
             "fc41": cls.FEDORA41,
+            str(cls.ROCKY10): cls.ROCKY10,
+            'rockylinux10': cls.ROCKY10,
             str(cls.UBUNTU2204): cls.UBUNTU2204,
             "ubuntu-jammy": cls.UBUNTU2204,
             "jammy": cls.UBUNTU2204,
@@ -137,6 +146,7 @@ class DefaultImage(StrEnum):
     CENTOS8 = "quay.io/centos/centos:stream8"
     CENTOS9 = "quay.io/centos/centos:stream9"
     FEDORA41 = "registry.fedoraproject.org/fedora:41"
+    ROCKY10 = "docker.io/rockylinux/rockylinux:10"
     UBUNTU2204 = "docker.io/ubuntu:22.04"
     UBUNTU2404 = "docker.io/ubuntu:24.04"