]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
script/build-with-container: add distro references for ubuntu 26.04
authorJohn Mulligan <jmulligan@redhat.com>
Thu, 26 Feb 2026 21:38:43 +0000 (16:38 -0500)
committerJohn Mulligan <jmulligan@redhat.com>
Tue, 5 May 2026 14:46:40 +0000 (10:46 -0400)
Prepare for the eventual use of ubuntu 26.04 (resolute) in Ceph builds.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
src/script/build-with-container.py

index 1c23ce71d471e1648e04a88944cb6ec9f3a9ba47..b17db22ef08001dda71f82792f0ddd33bc749435 100755 (executable)
@@ -112,6 +112,7 @@ class DistroKind(StrEnum):
     UBUNTU2004 = "ubuntu20.04"
     UBUNTU2204 = "ubuntu22.04"
     UBUNTU2404 = "ubuntu24.04"
+    UBUNTU2604 = "ubuntu26.04"
     DEBIAN12 = "debian12"
     DEBIAN13 = "debian13"
 
@@ -162,6 +163,9 @@ class DistroKind(StrEnum):
             str(cls.UBUNTU2404): cls.UBUNTU2404,
             "ubuntu-noble": cls.UBUNTU2404,
             "noble": cls.UBUNTU2404,
+            str(cls.UBUNTU2604): cls.UBUNTU2604,
+            "ubuntu-resolute": cls.UBUNTU2604,
+            "resolute": cls.UBUNTU2604,
             # debian
             str(cls.DEBIAN12): cls.DEBIAN12,
             "debian-bookworm": cls.DEBIAN12,
@@ -196,6 +200,7 @@ class DefaultImage(StrEnum):
     UBUNTU2004 = "docker.io/ubuntu:20.04"
     UBUNTU2204 = "docker.io/ubuntu:22.04"
     UBUNTU2404 = "docker.io/ubuntu:24.04"
+    UBUNTU2604 = "docker.io/ubuntu:26.04"
     # debian
     DEBIAN12 = "docker.io/debian:bookworm"
     DEBIAN13 = "docker.io/debian:trixie"