kgess-mirror/openstack-kolla
1
0
Fork 0
mirror of https://opendev.org/openstack/kolla.git synced 2026-01-11 19:57:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to Debian Trixie

Browse source 
Change-Id: Ib7f551d4a7c6ffe95786853d6899e704de4747b8
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This commit is contained in:
Michal Nasiadka 2025-10-24 16:58:36 +02:00
parent a7ee5ccb2b
commit cee27f6426
14 changed files with 66 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/source/support_matrix.rst
View file

@ -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
================== =============================== ================

2
docker/base/apt_preferences.debian
View file

@ -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

4
docker/base/debian.sources
View file

@ -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

3
docker/httpd/Dockerfile.j2
View file

@ -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 %}

2
docker/openstack-base/Dockerfile.j2
View file

@ -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',

6
docker/valkey/valkey-sentinel/Dockerfile.j2
View file

@ -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")) }}

10
docker/valkey/valkey-server/Dockerfile.j2
View file

@ -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() }}

9
kolla/common/config.py
View file

@ -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

2
kolla/image/unbuildable.py
View file

@ -31,8 +31,6 @@ UNBUILDABLE_IMAGES = {
},
'debian': {
"openvswitch-netcontrold",
# https://bugs.launchpad.net/kolla/+bug/2027668
},
'rocky': {

19
kolla/template/repos.yaml
View file

@ -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.

8
kolla/tests/test_methods.py
View file

@ -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"

5
releasenotes/notes/debian-trixie-23987480043dc662.yaml Normal file
View file

@ -0,0 +1,5 @@
---
features:
- |
Debian ``trixie`` is now used instead of ``bookworm``. Trixie is the current
stable release of Debian.

42
zuul.d/debian.yaml
View file

@ -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

13
zuul.d/nodesets.yaml
View file

@ -16,13 +16,24 @@
nodes:
- name: primary
label: debian-bookworm-8GB
- nodeset:
name: kolla-debian-bookworm-arm64-8GB
nodes:
- name: primary
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: