diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index c44a74b311..bf012877d1 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -82,10 +82,10 @@ label: rockylinux-9 - nodeset: - name: kolla-ubuntu-jammy + name: kolla-ubuntu-noble nodes: - name: primary - label: ubuntu-jammy + label: ubuntu-noble - nodeset: name: kolla-debian-bookworm @@ -112,10 +112,10 @@ label: rockylinux-9-arm64 - nodeset: - name: kolla-ubuntu-jammy-aarch64 + name: kolla-ubuntu-noble-aarch64 nodes: - name: primary - label: ubuntu-jammy-arm64 + label: ubuntu-noble-arm64 - job: name: kolla-base diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index a69eb104bd..76465a729d 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -50,23 +50,23 @@ - job: name: kolla-build-ubuntu parent: kolla-base - nodeset: kolla-ubuntu-jammy + nodeset: kolla-ubuntu-noble vars: base_distro: ubuntu - base_distro_version: jammy + base_distro_version: noble - job: name: kolla-build-ubuntu-podman parent: kolla-base-podman - nodeset: kolla-ubuntu-jammy + nodeset: kolla-ubuntu-noble vars: base_distro: ubuntu - base_distro_version: jammy + base_distro_version: noble - job: name: kolla-build-ubuntu-aarch64 parent: kolla-build-ubuntu - nodeset: kolla-ubuntu-jammy-aarch64 + nodeset: kolla-ubuntu-noble-aarch64 voting: false - job: @@ -95,6 +95,6 @@ - job: name: kolla-build-no-infra-wheels-ubuntu parent: kolla-build-no-infra-wheels-base - nodeset: kolla-ubuntu-jammy + nodeset: kolla-ubuntu-noble vars: base_distro: ubuntu diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index b2dc5ff3e5..acb6629701 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -19,7 +19,7 @@ Distribution Default base Default base tag ================== =============================== ================ Rocky Linux quay.io/rockylinux/rockylinux 9 Debian Bullseye debian bullseye -Ubuntu Jammy ubuntu 22.04 +Ubuntu Noble ubuntu 24.04 ================== =============================== ================ The remainder of this document outlines which images are supported on which of diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index eda3083d1a..158cbb0855 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,16 +1,16 @@ # For non-x86 architectures we use sources.list.ubuntu. # Default repos -deb mirror://mirrors.ubuntu.com/mirrors.txt jammy main universe -deb mirror://mirrors.ubuntu.com/mirrors.txt jammy-updates main universe -deb mirror://mirrors.ubuntu.com/mirrors.txt jammy-security main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble-updates main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ jammy-backports main universe +deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/caracal main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/dalmatian main # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index 263e728d31..81a5c7a4f8 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -1,14 +1,14 @@ # Default repos -deb http://ports.ubuntu.com/ jammy main universe -deb http://ports.ubuntu.com/ jammy-updates main universe -deb http://ports.ubuntu.com/ jammy-security main universe +deb http://ports.ubuntu.com/ noble main universe +deb http://ports.ubuntu.com/ noble-updates main universe +deb http://ports.ubuntu.com/ noble-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ jammy-backports main universe +deb http://ports.ubuntu.com/ noble-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/caracal main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/dalmatian main # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 1f487194ac..dc85ce1fa4 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -68,12 +68,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = nova_libvirt_packages + [ 'ovmf', ] %} - # NOTE(hrw): Debian merged 'qemu-kvm' into 'qemu-system-ARCH' in 5.0-9 - {% if base_distro == 'ubuntu' %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'qemu-kvm' - ] %} - {% endif %} {% endif %} {% if base_distro in ['debian'] %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 9bf617d8b0..39ce63cb37 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -28,14 +28,14 @@ DEFAULT_BASE_TAGS = { 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'}, 'debian': {'name': 'debian', 'tag': 'bookworm'}, 'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'}, - 'ubuntu': {'name': 'ubuntu', 'tag': '22.04'}, + 'ubuntu': {'name': 'ubuntu', 'tag': '24.04'}, } # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release DISTRO_PRETTY_NAME = { 'centos': 'CentOS Stream 9', 'debian': 'Debian GNU/Linux 12 (bookworm)', 'rocky': 'Rocky Linux 9.* (Blue Onyx)', - 'ubuntu': 'Ubuntu 22.04', + 'ubuntu': 'Ubuntu 24.04.* LTS', } OPENSTACK_RELEASE = 'master' diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 65cb7b745b..78d789a9e5 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -174,12 +174,12 @@ rocky-aarch64: ubuntu: erlang: url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" - suite: "jammy" + suite: "noble" component: "main" gpg_key: "erlang-ppa.gpg" fluentd: - url: "https://packages.treasuredata.com/lts/5/ubuntu/jammy/" - suite: "jammy" + url: "https://packages.treasuredata.com/lts/5/ubuntu/noble/" + suite: "noble" component: "contrib" gpg_key: "treasuredata.asc" grafana: @@ -189,12 +189,13 @@ ubuntu: gpg_key: "grafana.asc" influxdb: url: "https://repos.influxdata.com/ubuntu" + # TODO(mnasiadka): Switch to noble when available suite: "jammy" component: "stable" gpg_key: "influxdb.asc" mariadb: url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" - suite: "jammy" + suite: "noble" component: "main" gpg_key: "mariadb.gpg" opensearch: @@ -208,25 +209,25 @@ ubuntu: component: "main" gpg_key: "opensearch.asc" proxysql: - url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/jammy/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/noble/" suite: "./" component: "" gpg_key: "proxysql.asc" rabbitmq: url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" - suite: "jammy" + suite: "noble" component: "main" gpg_key: "rabbitmq.gpg" ubuntu-aarch64: erlang: url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" - suite: "jammy" + suite: "noble" component: "main" gpg_key: "erlang-ppa.gpg" fluentd: - url: "https://packages.treasuredata.com/lts/5/ubuntu/jammy/" - suite: "jammy" + url: "https://packages.treasuredata.com/lts/5/ubuntu/noble/" + suite: "noble" component: "contrib" gpg_key: "treasuredata.asc" grafana: @@ -236,12 +237,13 @@ ubuntu-aarch64: gpg_key: "grafana.asc" influxdb: url: "https://repos.influxdata.com/ubuntu" + # TODO(mnasiadka): Switch to noble when available suite: "jammy" component: "stable" gpg_key: "influxdb.asc" mariadb: url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" - suite: "jammy" + suite: "noble" component: "main" gpg_key: "mariadb.gpg" opensearch: @@ -255,13 +257,13 @@ ubuntu-aarch64: component: "main" gpg_key: "opensearch.asc" proxysql: - url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/jammy/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/noble/" suite: "./" component: "" gpg_key: "proxysql.asc" rabbitmq: url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" - suite: "jammy" + suite: "noble" component: "main" arch: "amd64" gpg_key: "rabbitmq.gpg" diff --git a/releasenotes/notes/ubuntu-24-04-585855b7d4753ce3.yaml b/releasenotes/notes/ubuntu-24-04-585855b7d4753ce3.yaml new file mode 100644 index 0000000000..ea3590c6fe --- /dev/null +++ b/releasenotes/notes/ubuntu-24-04-585855b7d4753ce3.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Ubuntu images now use Noble 24.04 (``ubuntu:24.04``) as the default base + image. diff --git a/requirements.txt b/requirements.txt index f471843cf3..49aa8e1f34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 Jinja2>=3.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) oslo.config>=5.1.0 # Apache-2.0 +setuptools>=64.0.0 # PSF/ZPL diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml index cee184b0a7..6d59c40497 100644 --- a/tests/playbooks/pre.yml +++ b/tests/playbooks/pre.yml @@ -158,14 +158,6 @@ prefix = "docker.io" location = "{{ zuul_site_mirror_fqdn }}:8082" - - name: Add libcontainers repo for newer buildah on Ubuntu 22.04 - ansible.builtin.apt_repository: - repo: deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ / - filename: kubic-libcontainers - state: present - become: true - when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "jammy" - - name: Install Podman package: name: podman