Skip to content

Commit 00497a0

Browse files
authored
Merge pull request #377 from stackhpc/noble
Add Ubuntu Noble support
2 parents 4cdff62 + c3e9303 commit 00497a0

File tree

2 files changed

+50
-2
lines changed

2 files changed

+50
-2
lines changed

ansible/inventory/group_vars/all/package-repos

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ deb_package_repos:
6868
policy: immediate
6969
architectures: amd64
7070
components: main
71-
distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope jammy-updates/caracal
71+
distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope jammy-updates/caracal noble-updates/epoxy
7272
mirror: true
7373
mode: verbatim
7474
base_path: ubuntu-cloud-archive/
@@ -110,6 +110,40 @@ deb_package_repos:
110110
sync_group: ubuntu_jammy
111111
distribution_name: ubuntu-jammy-security-
112112

113+
# Base Ubuntu Noble 24.04 repositories
114+
- name: Ubuntu Noble
115+
url: http://archive.ubuntu.com/ubuntu
116+
policy: immediate
117+
architectures: amd64
118+
components: main restricted universe multiverse
119+
# NOTE: Include noble-security here to include all dists under one mirror
120+
# path. This allows us to include security updates when using
121+
# DIB_DISTRIBUTION_MIRROR with the Diskimage builder ubuntu-minimal
122+
# element.
123+
distributions: noble noble-updates noble-backports noble-security
124+
mirror: true
125+
mode: verbatim
126+
base_path: ubuntu/noble/
127+
short_name: ubuntu_noble
128+
sync_group: ubuntu_noble
129+
distribution_name: ubuntu-noble-
130+
131+
# https://wiki.ubuntu.com/SecurityTeam/FAQ suggests that security.ubuntu.com
132+
# is preferable for security updates, so use this in preference to the
133+
# noble-security dist in the main Ubuntu noble repository where possible.
134+
- name: Ubuntu Noble security
135+
url: http://security.ubuntu.com/ubuntu
136+
policy: immediate
137+
architectures: amd64
138+
components: main restricted universe multiverse
139+
distributions: noble-security
140+
mirror: true
141+
mode: verbatim
142+
base_path: ubuntu/noble-security/
143+
short_name: ubuntu_noble_security
144+
sync_group: ubuntu_noble
145+
distribution_name: ubuntu-noble-security-
146+
113147
# Third-party repositories
114148

115149
## Separate repositories for each distribution because
@@ -140,6 +174,19 @@ deb_package_repos:
140174
sync_group: docker
141175
distribution_name: docker-ce-for-ubuntu-jammy-
142176

177+
- name: Docker CE for Ubuntu Noble
178+
url: https://download.docker.com/linux/ubuntu
179+
policy: immediate
180+
architectures: amd64
181+
distributions: noble
182+
components: stable
183+
mirror: true
184+
mode: verbatim
185+
base_path: docker-ce/ubuntu-noble/
186+
short_name: docker_ce_ubuntu_noble
187+
sync_group: docker
188+
distribution_name: docker-ce-for-ubuntu-noble-
189+
143190
# Standard Apt mirrors do not contain cephadm Reef, only Quincy
144191
- name: Ceph Reef for Debian
145192
url: https://download.ceph.com/debian-reef/

ansible/validate-deb-repos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@
8181
- name: Assert that Deb package repository list can be filtered to one group
8282
ansible.builtin.assert:
8383
that:
84-
- deb_package_repos_filtered | length == 2
84+
- deb_package_repos_filtered | length == 3
8585
- deb_package_repos_filtered[0].short_name == 'docker_ce_ubuntu_focal'
8686
- deb_package_repos_filtered[1].short_name == 'docker_ce_ubuntu_jammy'
87+
- deb_package_repos_filtered[2].short_name == 'docker_ce_ubuntu_noble'
8788
vars:
8889
package_sync_group: docker
8990

0 commit comments

Comments
 (0)