openstack/kolla
Code Issues Proposed changes

Merge "Move to Debian 12 'bookworm'"

Browse Source
This commit is contained in:
Zuul 2023-08-21 15:11:35 +00:00 committed by Gerrit Code Review
commit 999cabd6e0
10 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.zuul.d/debian.yaml
View File

@ -3,18 +3,28 @@
check: check:
jobs: jobs:
- kolla-build-debian - kolla-build-debian
- kolla-ansible-debian - kolla-ansible-debian:
- kolla-ansible-debian-upgrade vars:
kolla_python_version: "3.11"
- kolla-ansible-debian-upgrade:
vars:
kolla_python_version: "3.11"
check-arm64: check-arm64:
jobs: jobs:
- kolla-build-debian-aarch64 - kolla-build-debian-aarch64
- kolla-ansible-debian-aarch64: - kolla-ansible-debian-aarch64:
vars:
kolla_python_version: "3.11"
voting: false voting: false
gate: gate:
jobs: jobs:
- kolla-build-debian - kolla-build-debian
- kolla-ansible-debian - kolla-ansible-debian:
- kolla-ansible-debian-upgrade vars:
kolla_python_version: "3.11"
- kolla-ansible-debian-upgrade:
vars:
kolla_python_version: "3.11"
periodic: periodic:
jobs: jobs:
- kolla-publish-debian-quay - kolla-publish-debian-quay

2
docker/base/Dockerfile.j2
View File

@ -254,7 +254,7 @@ COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
RUN apt update \ RUN apt update \
&& apt install -y --no-install-recommends extrepo \ && apt install -y --no-install-recommends extrepo \
&& extrepo enable openstack_zed \ && extrepo enable openstack_antelope \
&& apt purge -y extrepo \ && apt purge -y extrepo \
&& apt --purge autoremove -y \ && apt --purge autoremove -y \
&& apt clean && apt clean

17
docker/base/apt_preferences.debian
View File

@ -4,20 +4,5 @@ Pin-Priority: 1000
# NOTE(hrw): we do not want backports unless requested # NOTE(hrw): we do not want backports unless requested
Package: * Package: *
Pin: release n=bullseye-backports Pin: release n=bookworm-backports
Pin-Priority: -1000 Pin-Priority: -1000
# NOTE(hrw): let us list some backports
# - openvswitch 2.15
# - ovn 21.06
# - libvirt 8
# - qemu 7.*
# - swtpm
Package: openvswitch* python3-openvswitch ovn-* libvirt* qemu-* swtpm* libtpms0
Pin: release n=bullseye-backports
Pin-Priority: 1024
# NOTE(hrw): Debian OpenStack Team repo has some backports we do not want
Package: git*
Pin: release n=bullseye
Pin-Priority: 1024

8
docker/base/sources.list.debian
View File

@ -1,11 +1,11 @@
# Default repos # Default repos
deb http://deb.debian.org/debian bullseye main deb http://deb.debian.org/debian bookworm main
# debian security updates # debian security updates
deb http://deb.debian.org/debian-security bullseye-security main deb http://deb.debian.org/debian-security bookworm-security main
# debian updates # debian updates
deb http://deb.debian.org/debian bullseye-updates main deb http://deb.debian.org/debian bookworm-updates main
# debian backports # debian backports
deb http://deb.debian.org/debian bullseye-backports main deb http://deb.debian.org/debian bookworm-backports main

4
kolla/common/config.py
View File

@ -25,14 +25,14 @@ BASE_OS_DISTRO = ['centos', 'debian', 'rocky', 'ubuntu']
BASE_ARCH = ['x86_64', 'aarch64'] BASE_ARCH = ['x86_64', 'aarch64']
DEFAULT_BASE_TAGS = { DEFAULT_BASE_TAGS = {
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'}, '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'}, 'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'},
'ubuntu': {'name': 'ubuntu', 'tag': '22.04'}, 'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
} }
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
DISTRO_PRETTY_NAME = { DISTRO_PRETTY_NAME = {
'centos': 'CentOS Stream 9', 'centos': 'CentOS Stream 9',
'debian': 'Debian GNU/Linux 11 (bullseye)', 'debian': 'Debian GNU/Linux 12 (bookworm)',
'rocky': 'Rocky Linux 9.* (Blue Onyx)', 'rocky': 'Rocky Linux 9.* (Blue Onyx)',
'ubuntu': 'Ubuntu 22.04', 'ubuntu': 'Ubuntu 22.04',
} }

2
kolla/image/kolla_worker.py
View File

@ -118,7 +118,7 @@ class KollaWorker(object):
self.distro_package_manager = 'dnf' self.distro_package_manager = 'dnf'
self.base_package_type = 'rpm' self.base_package_type = 'rpm'
elif self.base in ['debian']: 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.distro_package_manager = 'apt'
self.base_package_type = 'deb' self.base_package_type = 'deb'
elif self.base in ['ubuntu']: elif self.base in ['ubuntu']:

2
kolla/image/unbuildable.py
View File

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

68
kolla/template/repos.yaml
View File

@ -36,26 +36,28 @@ centos-aarch64:
td-agent: "treasuredata" td-agent: "treasuredata"
debian: debian:
erlang: # NOTE(hrw): Debian/bookworm has Erlang 25 in repo
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" # erlang:
suite: "focal" # url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
component: "main" # suite: "jammy"
gpg_key: "erlang-ppa.gpg" # component: "main"
# gpg_key: "erlang-ppa.gpg"
grafana: grafana:
url: "https://apt.grafana.com" url: "https://apt.grafana.com"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "grafana.asc" gpg_key: "grafana.asc"
influxdb: influxdb:
url: "https://repos.influxdata.com/debian" url: "https://repos.influxdata.com/ubuntu"
suite: "bullseye" suite: "jammy"
component: "stable" component: "stable"
gpg_key: "influxdb.asc" gpg_key: "influxdb.asc"
mariadb: # NOTE(hrw): Debian/bookworm has MariaDB 10.11
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" # mariadb:
suite: "bullseye" # url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
component: "main" # suite: "bookworm"
gpg_key: "mariadb.gpg" # component: "main"
# gpg_key: "mariadb.gpg"
opensearch: opensearch:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
suite: "stable" suite: "stable"
@ -67,42 +69,44 @@ debian:
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
proxysql: proxysql:
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/" url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/"
suite: "./" suite: "./"
component: "" component: ""
gpg_key: "proxysql.asc" gpg_key: "proxysql.asc"
rabbitmq: rabbitmq:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
suite: "bullseye" suite: "bookworm"
component: "main" component: "main"
gpg_key: "rabbitmq.gpg" gpg_key: "rabbitmq.gpg"
td-agent: td-agent:
url: "http://packages.treasuredata.com/4/debian/bullseye" url: "http://packages.treasuredata.com/4/ubuntu/jammy"
suite: "bullseye" suite: "jammy"
component: "contrib" component: "contrib"
gpg_key: "treasuredata.asc" gpg_key: "treasuredata.asc"
debian-aarch64: debian-aarch64:
erlang: # NOTE(hrw): Debian/bookworm has Erlang 25 in repo
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" # erlang:
suite: "focal" # url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
component: "main" # suite: "jammy"
gpg_key: "erlang-ppa.gpg" # component: "main"
# gpg_key: "erlang-ppa.gpg"
grafana: grafana:
url: "https://apt.grafana.com" url: "https://apt.grafana.com"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "grafana.asc" gpg_key: "grafana.asc"
influxdb: influxdb:
url: "https://repos.influxdata.com/debian" url: "https://repos.influxdata.com/ubuntu"
suite: "bullseye" suite: "jammy"
component: "stable" component: "stable"
gpg_key: "influxdb.asc" gpg_key: "influxdb.asc"
mariadb: # NOTE(hrw): Debian/bookworm has MariaDB 10.11
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" # mariadb:
suite: "bullseye" # url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
component: "main" # suite: "bookworm"
gpg_key: "mariadb.gpg" # component: "main"
# gpg_key: "mariadb.gpg"
opensearch: opensearch:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
suite: "stable" suite: "stable"
@ -114,18 +118,18 @@ debian-aarch64:
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
proxysql: proxysql:
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/" url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/"
suite: "./" suite: "./"
component: "" component: ""
gpg_key: "proxysql.asc" gpg_key: "proxysql.asc"
rabbitmq: rabbitmq:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
suite: "bullseye" suite: "bookworm"
component: "main" component: "main"
gpg_key: "rabbitmq.gpg" gpg_key: "rabbitmq.gpg"
td-agent: td-agent:
url: "http://packages.treasuredata.com/4/debian/bullseye" url: "http://packages.treasuredata.com/4/ubuntu/jammy"
suite: "bullseye" suite: "jammy"
component: "contrib" component: "contrib"
gpg_key: "treasuredata.asc" gpg_key: "treasuredata.asc"

2
kolla/tests/test_build.py
View File

@ -637,7 +637,7 @@ class KollaWorkerTest(base.TestCase):
"""check distro_python_version for Debian""" """check distro_python_version for Debian"""
self.conf.set_override('base', 'debian') self.conf.set_override('base', 'debian')
kolla = build.KollaWorker(self.conf) 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): def test_build_distro_python_version_ubuntu(self):
"""check distro_python_version for Ubuntu""" """check distro_python_version for Ubuntu"""

2
kolla/tests/test_methods.py
View File

@ -117,7 +117,7 @@ class MethodsTest(base.TestCase):
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
expectCmd += "echo 'Types: deb' " expectCmd += "echo 'Types: deb' "
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " 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 += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' " expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' "
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources" expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources"