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
This commit is contained in:
Marcin Juszkiewicz
Michal Nasiadka
parent
a004abbdc3
commit
7fa2ac132c
@ -3,18 +3,28 @@
|
||||
check:
|
||||
jobs:
|
||||
- kolla-build-debian
|
||||
- kolla-ansible-debian
|
||||
- kolla-ansible-debian-upgrade
|
||||
- kolla-ansible-debian:
|
||||
vars:
|
||||
kolla_python_version: "3.11"
|
||||
- kolla-ansible-debian-upgrade:
|
||||
vars:
|
||||
kolla_python_version: "3.11"
|
||||
check-arm64:
|
||||
jobs:
|
||||
- kolla-build-debian-aarch64
|
||||
- kolla-ansible-debian-aarch64:
|
||||
vars:
|
||||
kolla_python_version: "3.11"
|
||||
voting: false
|
||||
gate:
|
||||
jobs:
|
||||
- kolla-build-debian
|
||||
- kolla-ansible-debian
|
||||
- kolla-ansible-debian-upgrade
|
||||
- kolla-ansible-debian:
|
||||
vars:
|
||||
kolla_python_version: "3.11"
|
||||
- kolla-ansible-debian-upgrade:
|
||||
vars:
|
||||
kolla_python_version: "3.11"
|
||||
periodic:
|
||||
jobs:
|
||||
- kolla-publish-debian-quay
|
||||
|
||||
@ -254,7 +254,7 @@ COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
|
||||
|
||||
RUN apt update \
|
||||
&& apt install -y --no-install-recommends extrepo \
|
||||
&& extrepo enable openstack_zed \
|
||||
&& extrepo enable openstack_antelope \
|
||||
&& apt purge -y extrepo \
|
||||
&& apt --purge autoremove -y \
|
||||
&& apt clean
|
||||
|
||||
@ -4,20 +4,5 @@ Pin-Priority: 1000
|
||||
|
||||
# NOTE(hrw): we do not want backports unless requested
|
||||
Package: *
|
||||
Pin: release n=bullseye-backports
|
||||
Pin: release n=bookworm-backports
|
||||
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
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# Default repos
|
||||
deb http://deb.debian.org/debian bullseye main
|
||||
deb http://deb.debian.org/debian bookworm main
|
||||
|
||||
# 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
|
||||
deb http://deb.debian.org/debian bullseye-updates main
|
||||
deb http://deb.debian.org/debian bookworm-updates main
|
||||
|
||||
# debian backports
|
||||
deb http://deb.debian.org/debian bullseye-backports main
|
||||
deb http://deb.debian.org/debian bookworm-backports main
|
||||
|
||||
@ -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',
|
||||
}
|
||||
|
||||
@ -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']:
|
||||
|
||||
@ -32,6 +32,8 @@ UNBUILDABLE_IMAGES = {
|
||||
},
|
||||
|
||||
'debian': {
|
||||
"openvswitch-netcontrold",
|
||||
# https://bugs.launchpad.net/kolla/+bug/2027668
|
||||
},
|
||||
|
||||
'rocky': {
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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"""
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user