Skip to content

Commit

Permalink
Add Ubuntu Noble support
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-Welsh committed Jan 31, 2025
1 parent 6531006 commit 7bd2e2d
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 2 deletions.
49 changes: 48 additions & 1 deletion ansible/inventory/group_vars/all/package-repos
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ deb_package_repos:
policy: immediate
architectures: amd64
components: main
distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope jammy-updates/caracal
distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope jammy-updates/caracal noble-updates/epoxy
mirror: true
mode: verbatim
base_path: ubuntu-cloud-archive/
Expand Down Expand Up @@ -110,6 +110,40 @@ deb_package_repos:
sync_group: ubuntu_jammy
distribution_name: ubuntu-jammy-security-

# Base Ubuntu Noble 24.04 repositories
- name: Ubuntu Noble
url: http://archive.ubuntu.com/ubuntu
policy: immediate
architectures: amd64
components: main restricted universe multiverse
# NOTE: Include noble-security here to include all dists under one mirror
# path. This allows us to include security updates when using
# DIB_DISTRIBUTION_MIRROR with the Diskimage builder ubuntu-minimal
# element.
distributions: noble noble-updates noble-backports noble-security
mirror: true
mode: verbatim
base_path: ubuntu/noble/
short_name: ubuntu_noble
sync_group: ubuntu_noble
distribution_name: ubuntu-noble-

# https://wiki.ubuntu.com/SecurityTeam/FAQ suggests that security.ubuntu.com
# is preferable for security updates, so use this in preference to the
# noble-security dist in the main Ubuntu noble repository where possible.
- name: Ubuntu Noble security
url: http://security.ubuntu.com/ubuntu
policy: immediate
architectures: amd64
components: main restricted universe multiverse
distributions: noble-security
mirror: true
mode: verbatim
base_path: ubuntu/noble-security/
short_name: ubuntu_noble_security
sync_group: ubuntu_noble
distribution_name: ubuntu-noble-security-

# Third-party repositories

## Separate repositories for each distribution because
Expand Down Expand Up @@ -140,6 +174,19 @@ deb_package_repos:
sync_group: docker
distribution_name: docker-ce-for-ubuntu-jammy-

- name: Docker CE for Ubuntu Noble
url: https://download.docker.com/linux/ubuntu
policy: immediate
architectures: amd64
distributions: noble
components: stable
mirror: true
mode: verbatim
base_path: docker-ce/ubuntu-noble/
short_name: docker_ce_ubuntu_noble
sync_group: docker
distribution_name: docker-ce-for-ubuntu-noble-

# Standard Apt mirrors do not contain cephadm Reef, only Quincy
- name: Ceph Reef for Debian
url: https://download.ceph.com/debian-reef/
Expand Down
3 changes: 2 additions & 1 deletion ansible/validate-deb-repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@
- name: Assert that Deb package repository list can be filtered to one group
ansible.builtin.assert:
that:
- deb_package_repos_filtered | length == 2
- deb_package_repos_filtered | length == 3
- deb_package_repos_filtered[0].short_name == 'docker_ce_ubuntu_focal'
- deb_package_repos_filtered[1].short_name == 'docker_ce_ubuntu_jammy'
- deb_package_repos_filtered[2].short_name == 'docker_ce_ubuntu_noble'
vars:
package_sync_group: docker

Expand Down

0 comments on commit 7bd2e2d

Please sign in to comment.