Merge "Switch to Debian Trixie"

4 files changed, 18 insertions, 20 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index f0fa025e3..999939301 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -26,22 +26,21 @@ BASE_ARCH = ['x86_64', 'aarch64']
 DEBIAN_ARCH = ['amd64', 'arm64']
 DEFAULT_BASE_TAGS = {
     'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream10'},
-    'debian': {'name': 'debian', 'tag': 'bookworm'},
+    'debian': {'name': 'debian', 'tag': 'trixie'},
     'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '10'},
     'ubuntu': {'name': 'ubuntu', 'tag': '24.04'},
 }
 # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
 DISTRO_PRETTY_NAME = {
     'centos': 'CentOS Stream 10',
-    'debian': 'Debian GNU/Linux 12 (bookworm)',
+    'debian': 'Debian GNU/Linux 13 (trixie)',
     'rocky': 'Rocky Linux 10.* (Red Quartz)',
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
 
 OPENSTACK_RELEASE = 'master'
-# NOTE(mnasiadka): Using Epoxy here, since Debian OpenStack builds Flamingo
-#                  only for Trixie
-OPENSTACK_RELEASE_CODENAME = 'Epoxy'
+# NOTE(mnasiadka): Using Flamingo here until Gazpacho shows up in osbpo
+OPENSTACK_RELEASE_CODENAME = 'Flamingo'
 
 # TODO(mandre) check for file integrity instead of downloading from an HTTPS
 # source
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index d117ba0a7..06c1f51f9 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -31,8 +31,6 @@ UNBUILDABLE_IMAGES = {
     },
 
     'debian': {
-        "openvswitch-netcontrold",
-        # https://bugs.launchpad.net/kolla/+bug/2027668
     },
 
     'rocky': {
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 7d9d7ec71..efdb15376 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -27,39 +27,40 @@ deb:
 debian:
   erlang:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "jammy"
+    suite: "noble"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   docker-ce:
     url: "https://download.docker.com/linux/debian"
-    suite: "bookworm"
+    suite: "trixie"
     component: "stable"
     gpg_key: "docker-ce.asc"
   fluentd:
-    url: "https://fluentd.cdn.cncf.io/lts/6/debian/bookworm"
-    suite: "bookworm"
+    url: "https://fluentd.cdn.cncf.io/lts/6/debian/trixie"
+    suite: "trixie"
     component: "contrib"
     gpg_key: "fluentd.asc"
+  # NOTE(mnasiadka): 11.4 does not have trixie builds yet
   mariadb:
     url: "https://dlm.mariadb.com/repo/mariadb-server/11.4/repo/debian"
     suite: "bookworm"
     component: "main"
     gpg_key: "mariadb.gpg"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/bookworm/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/trixie/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm"
-    suite: "bookworm"
+    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie/"
+    suite: "trixie"
     component: "main"
     gpg_key: "rabbitmq.gpg"
 
 debian-aarch64:
   rabbitmq:
-    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm"
-    suite: "bookworm"
+    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie"
+    suite: "trixie"
     component: "main"
     # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
     # syncing binary-aarch64 - we're using amd64 here.
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py
index 2d2fdd3ed..f30462362 100644
--- a/kolla/tests/test_methods.py
+++ b/kolla/tests/test_methods.py
@@ -191,13 +191,13 @@ class MethodsTest(base.TestCase):
         }
 
         result = methods.handle_repos(template_vars, ["rabbitmq"], "enable")
-        expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' "  # noqa: E501
+        expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Types: deb' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
-        expectCmd += "echo 'Suites: bookworm' "
+        expectCmd += "echo 'Suites: trixie' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@@ -236,13 +236,13 @@ class MethodsTest(base.TestCase):
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
 
         expectCmd += "echo 'Uris: "
-        expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' "  # noqa: E501
+        expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie/' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Types: deb' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
-        expectCmd += "echo 'Suites: bookworm' "
+        expectCmd += "echo 'Suites: trixie' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources"