aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/source/support_matrix.rst2
-rw-r--r--docker/base/apt_preferences.debian2
-rw-r--r--docker/base/debian.sources4
-rw-r--r--docker/httpd/Dockerfile.j23
-rw-r--r--docker/openstack-base/Dockerfile.j22
-rw-r--r--docker/valkey/valkey-sentinel/Dockerfile.j26
-rw-r--r--docker/valkey/valkey-server/Dockerfile.j210
-rw-r--r--kolla/common/config.py9
-rw-r--r--kolla/image/unbuildable.py2
-rw-r--r--kolla/template/repos.yaml19
-rw-r--r--kolla/tests/test_methods.py8
-rw-r--r--releasenotes/notes/debian-trixie-23987480043dc662.yaml5
-rw-r--r--zuul.d/debian.yaml42
-rw-r--r--zuul.d/nodesets.yaml13
14 files changed, 66 insertions, 61 deletions
diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst
index 48338af6f..445ed08c6 100644
--- a/doc/source/support_matrix.rst
+++ b/doc/source/support_matrix.rst
@@ -18,7 +18,7 @@ The following base container images are supported:
Distribution Default base Default base tag
================== =============================== ================
Rocky Linux quay.io/rockylinux/rockylinux 10
-Debian Bookworm debian bookworm
+Debian Trixie debian trixie
Ubuntu Noble ubuntu 24.04
================== =============================== ================
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 5edb8814a..08e21ff22 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -1,4 +1,4 @@
# NOTE(hrw): we do not want backports unless requested
Package: *
-Pin: release n=bookworm-backports
+Pin: release n=trixie-backports
Pin-Priority: -1000
diff --git a/docker/base/debian.sources b/docker/base/debian.sources
index 2b502a609..28c61c81d 100644
--- a/docker/base/debian.sources
+++ b/docker/base/debian.sources
@@ -1,13 +1,13 @@
Types: deb
# http://snapshot.debian.org/archive/debian/20251020T000000Z
URIs: http://deb.debian.org/debian
-Suites: bookworm bookworm-updates bookworm-backports
+Suites: trixie trixie-updates trixie-backports
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
Types: deb
# http://snapshot.debian.org/archive/debian-security/20251020T000000Z
URIs: http://deb.debian.org/debian-security
-Suites: bookworm-security
+Suites: trixie-security
Components: main
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
diff --git a/docker/httpd/Dockerfile.j2 b/docker/httpd/Dockerfile.j2
index 2b58e7b12..a41465661 100644
--- a/docker/httpd/Dockerfile.j2
+++ b/docker/httpd/Dockerfile.j2
@@ -22,8 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'apache2',
'ca-certificates',
'libapache2-mod-auth-mellon',
- 'libapache2-mod-auth-openidc',
- 'libapache2-mod-proxy-uwsgi'
+ 'libapache2-mod-auth-openidc'
] %}
{% endif %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index fafd405d5..85b1f4b00 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'git',
'libapache2-mod-wsgi-py3',
'libffi-dev',
- 'libpcre3-dev',
+ 'libpcre2-dev',
'libpq-dev',
'libssl-dev',
'libxml2-dev',
diff --git a/docker/valkey/valkey-sentinel/Dockerfile.j2 b/docker/valkey/valkey-sentinel/Dockerfile.j2
index e3045d2fe..9cdfac282 100644
--- a/docker/valkey/valkey-sentinel/Dockerfile.j2
+++ b/docker/valkey/valkey-sentinel/Dockerfile.j2
@@ -11,11 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['epel']) }}
{% set valkey_sentinel_packages = ['valkey'] %}
{% elif base_package_type == 'deb' %}
- {% if base_distro == 'debian' %}
- {% set valkey_sentinel_packages = ['valkey-sentinel/bookworm-backports'] %}
- {% else %}
- {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
- {% endif %}
+ {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
{% endif %}
{{ macros.install_packages(valkey_sentinel_packages | customizable("packages")) }}
diff --git a/docker/valkey/valkey-server/Dockerfile.j2 b/docker/valkey/valkey-server/Dockerfile.j2
index 7b989f66b..9d187ffbe 100644
--- a/docker/valkey/valkey-server/Dockerfile.j2
+++ b/docker/valkey/valkey-server/Dockerfile.j2
@@ -9,14 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{{ macros.enable_extra_repos(['epel']) }}
- {% set valkey_server_packages = ['valkey'] %}
-{% elif base_package_type == 'deb' %}
- {% if base_distro == 'debian' %}
- {% set valkey_server_packages = ['valkey/bookworm-backports'] %}
- {% else %}
- {% set valkey_server_packages = ['valkey'] %}
- {% endif %}
{% endif %}
+
+{% set valkey_server_packages = ['valkey'] %}
+
{{ macros.install_packages(valkey_server_packages | customizable("packages")) }}
{{ macros.kolla_patch_sources() }}
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"
diff --git a/releasenotes/notes/debian-trixie-23987480043dc662.yaml b/releasenotes/notes/debian-trixie-23987480043dc662.yaml
new file mode 100644
index 000000000..68555cfea
--- /dev/null
+++ b/releasenotes/notes/debian-trixie-23987480043dc662.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ Debian ``trixie`` is now used instead of ``bookworm``. Trixie is the current
+ stable release of Debian.
diff --git a/zuul.d/debian.yaml b/zuul.d/debian.yaml
index 847a0b4d1..d40f10fc0 100644
--- a/zuul.d/debian.yaml
+++ b/zuul.d/debian.yaml
@@ -1,23 +1,23 @@
---
- job:
- name: kolla-build-debian-bookworm
+ name: kolla-build-debian-trixie
parent: kolla-base
- nodeset: kolla-debian-bookworm-8GB
+ nodeset: kolla-debian-trixie-8GB
- job:
- name: kolla-build-debian-bookworm-podman
+ name: kolla-build-debian-trixie-podman
parent: kolla-base-podman
- nodeset: kolla-debian-bookworm-8GB
+ nodeset: kolla-debian-trixie-8GB
- job:
- name: kolla-build-debian-bookworm-arm64
- parent: kolla-build-debian-bookworm
- nodeset: kolla-debian-bookworm-arm64-8GB
+ name: kolla-build-debian-trixie-arm64
+ parent: kolla-build-debian-trixie
+ nodeset: kolla-debian-trixie-arm64-8GB
voting: false
- job:
- name: kolla-publish-debian-bookworm-quay
- parent: kolla-build-debian-bookworm
+ name: kolla-publish-debian-trixie-quay
+ parent: kolla-build-debian-trixie
post-run: tests/playbooks/publish.yml
vars:
publisher: true
@@ -28,8 +28,8 @@
- kolla_quay_io_api_oct_2025
- job:
- name: kolla-publish-debian-bookworm-arm64-quay
- parent: kolla-build-debian-bookworm-arm64
+ name: kolla-publish-debian-trixie-arm64-quay
+ parent: kolla-build-debian-trixie-arm64
post-run: tests/playbooks/publish.yml
vars:
publisher: true
@@ -40,9 +40,9 @@
- kolla_quay_io_api_oct_2025
- job:
- name: kolla-build-debian-bookworm-no-infra-wheels
+ name: kolla-build-debian-trixie-no-infra-wheels
parent: kolla-build-no-infra-wheels-base
- nodeset: kolla-debian-bookworm-8GB
+ nodeset: kolla-debian-trixie-8GB
- project-template:
name: kolla-build-debian
@@ -50,19 +50,19 @@
Runs Kolla Debian build jobs.
check:
jobs:
- - kolla-build-debian-bookworm
- - kolla-build-debian-bookworm-podman
+ - kolla-build-debian-trixie
+ - kolla-build-debian-trixie-podman
check-arm64:
jobs:
- - kolla-build-debian-bookworm-arm64
+ - kolla-build-debian-trixie-arm64
gate:
jobs:
- - kolla-build-debian-bookworm
- - kolla-build-debian-bookworm-podman
+ - kolla-build-debian-trixie
+ - kolla-build-debian-trixie-podman
experimental:
jobs:
- - kolla-build-debian-bookworm-no-infra-wheels
+ - kolla-build-debian-trixie-no-infra-wheels
periodic:
jobs:
- - kolla-publish-debian-bookworm-quay
- - kolla-publish-debian-bookworm-arm64-quay
+ - kolla-publish-debian-trixie-quay
+ - kolla-publish-debian-trixie-arm64-quay
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 5a069beb6..1c85b45fb 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -16,7 +16,6 @@
nodes:
- name: primary
label: debian-bookworm-8GB
-
- nodeset:
name: kolla-debian-bookworm-arm64-8GB
nodes:
@@ -24,6 +23,18 @@
label: debian-bookworm-arm64-8GB
- nodeset:
+ name: kolla-debian-trixie-8GB
+ nodes:
+ - name: primary
+ label: debian-trixie-8GB
+
+- nodeset:
+ name: kolla-debian-trixie-arm64-8GB
+ nodes:
+ - name: primary
+ label: debian-trixie-arm64-8GB
+
+- nodeset:
name: kolla-rocky-10-8GB
nodes:
- name: primary
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 15:40:31 +0000