Move to Debian 12 'bookworm'

We move to use some components from distribution instead of 3rdparty
repos. At least for now - this may/will change later.

Packages from Debian:
- Erlang 25.2
- MariaDB 10.11

Some Ubuntu/jammy repositories are used in places where there is not
(yet) Debian/bookworm one.

openvswitch-netcontrold image fails as it needs to be converted to use
virtualenv - added into unbuildable images for now.

See https://etherpad.opendev.org/p/kolla-bobcat-ptg#L199 for more information.

Depends-On: https://review.opendev.org/891946

Change-Id: I45b5a5980fb2318f1aab23a3a6aaf0922563b171

6 files changed, 43 insertions, 37 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index d8eb6846e..4f3b9da75 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -25,14 +25,14 @@ BASE_OS_DISTRO = ['centos', 'debian', 'rocky', 'ubuntu']
 BASE_ARCH = ['x86_64', 'aarch64']
 DEFAULT_BASE_TAGS = {
     'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'},
-    'debian': {'name': 'debian', 'tag': 'bullseye'},
+    'debian': {'name': 'debian', 'tag': 'bookworm'},
     'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'},
     'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
 }
 # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
 DISTRO_PRETTY_NAME = {
     'centos': 'CentOS Stream 9',
-    'debian': 'Debian GNU/Linux 11 (bullseye)',
+    'debian': 'Debian GNU/Linux 12 (bookworm)',
     'rocky': 'Rocky Linux 9.* (Blue Onyx)',
     'ubuntu': 'Ubuntu 22.04',
 }
diff --git a/kolla/image/kolla_worker.py b/kolla/image/kolla_worker.py
index 1a665ddd4..b5b7dbd9b 100644
--- a/kolla/image/kolla_worker.py
+++ b/kolla/image/kolla_worker.py
@@ -118,7 +118,7 @@ class KollaWorker(object):
             self.distro_package_manager = 'dnf'
             self.base_package_type = 'rpm'
         elif self.base in ['debian']:
-            self.conf.distro_python_version = "3.9"
+            self.conf.distro_python_version = "3.11"
             self.distro_package_manager = 'apt'
             self.base_package_type = 'deb'
         elif self.base in ['ubuntu']:
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index 58327ca4d..fa19fdff1 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -32,6 +32,8 @@ 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 ecc52121a..d7619dbe2 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -36,26 +36,28 @@ centos-aarch64:
   td-agent: "treasuredata"
 
 debian:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "focal"
-    component: "main"
-    gpg_key: "erlang-ppa.gpg"
+  # NOTE(hrw): Debian/bookworm has Erlang 25 in repo
+  #  erlang:
+  #  url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
+  #  suite: "jammy"
+  #  component: "main"
+  #  gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
     component: "main"
     gpg_key: "grafana.asc"
   influxdb:
-    url: "https://repos.influxdata.com/debian"
-    suite: "bullseye"
+    url: "https://repos.influxdata.com/ubuntu"
+    suite: "jammy"
     component: "stable"
     gpg_key: "influxdb.asc"
-  mariadb:
-    url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
-    suite: "bullseye"
-    component: "main"
-    gpg_key: "mariadb.gpg"
+  # NOTE(hrw): Debian/bookworm has MariaDB 10.11
+  # mariadb:
+  #  url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
+  #  suite: "bookworm"
+  #  component: "main"
+  # gpg_key: "mariadb.gpg"
   opensearch:
     url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
     suite: "stable"
@@ -67,42 +69,44 @@ debian:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
     url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
-    suite: "bullseye"
+    suite: "bookworm"
     component: "main"
     gpg_key: "rabbitmq.gpg"
   td-agent:
-    url: "http://packages.treasuredata.com/4/debian/bullseye"
-    suite: "bullseye"
+    url: "http://packages.treasuredata.com/4/ubuntu/jammy"
+    suite: "jammy"
     component: "contrib"
     gpg_key: "treasuredata.asc"
 
 debian-aarch64:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "focal"
-    component: "main"
-    gpg_key: "erlang-ppa.gpg"
+  # NOTE(hrw): Debian/bookworm has Erlang 25 in repo
+  #  erlang:
+  #  url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
+  #  suite: "jammy"
+  #  component: "main"
+  #  gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
     component: "main"
     gpg_key: "grafana.asc"
   influxdb:
-    url: "https://repos.influxdata.com/debian"
-    suite: "bullseye"
+    url: "https://repos.influxdata.com/ubuntu"
+    suite: "jammy"
     component: "stable"
     gpg_key: "influxdb.asc"
-  mariadb:
-    url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
-    suite: "bullseye"
-    component: "main"
-    gpg_key: "mariadb.gpg"
+  # NOTE(hrw): Debian/bookworm has MariaDB 10.11
+  # mariadb:
+  #  url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
+  #  suite: "bookworm"
+  #  component: "main"
+  # gpg_key: "mariadb.gpg"
   opensearch:
     url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
     suite: "stable"
@@ -114,18 +118,18 @@ debian-aarch64:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
     url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
-    suite: "bullseye"
+    suite: "bookworm"
     component: "main"
     gpg_key: "rabbitmq.gpg"
   td-agent:
-    url: "http://packages.treasuredata.com/4/debian/bullseye"
-    suite: "bullseye"
+    url: "http://packages.treasuredata.com/4/ubuntu/jammy"
+    suite: "jammy"
     component: "contrib"
     gpg_key: "treasuredata.asc"
 
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index eb42595b8..be9b7a1b5 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -637,7 +637,7 @@ class KollaWorkerTest(base.TestCase):
         """check distro_python_version for Debian"""
         self.conf.set_override('base', 'debian')
         kolla = build.KollaWorker(self.conf)
-        self.assertEqual('3.9', kolla.distro_python_version)
+        self.assertEqual('3.11', kolla.distro_python_version)
 
     def test_build_distro_python_version_ubuntu(self):
         """check distro_python_version for Ubuntu"""
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py
index 9574bb382..e651bb337 100644
--- a/kolla/tests/test_methods.py
+++ b/kolla/tests/test_methods.py
@@ -117,7 +117,7 @@ class MethodsTest(base.TestCase):
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Types: deb' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
-        expectCmd += "echo 'Suites: bullseye' "
+        expectCmd += "echo 'Suites: bookworm' "
         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"