From 1e767825749c783052365b1081df0d5ef0ac67b8 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Wed, 10 Jun 2026 09:53:40 +0100 Subject: [PATCH 1/2] remove multiverse/non-free deb repos --- ansible/inventory/group_vars/all/deb-package-repos | 10 +++++----- .../inventory/group_vars/all/package-repos-deprecated | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/inventory/group_vars/all/deb-package-repos b/ansible/inventory/group_vars/all/deb-package-repos index e1fa31f2..8db3ad96 100644 --- a/ansible/inventory/group_vars/all/deb-package-repos +++ b/ansible/inventory/group_vars/all/deb-package-repos @@ -40,7 +40,7 @@ deb_package_repos: url: http://archive.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe multiverse + components: main restricted universe # NOTE: Include jammy-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 @@ -60,7 +60,7 @@ deb_package_repos: url: http://security.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe multiverse + components: main restricted universe distributions: jammy-security mirror: true mode: verbatim @@ -74,7 +74,7 @@ deb_package_repos: url: http://archive.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe multiverse + components: main restricted universe # 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 @@ -94,7 +94,7 @@ deb_package_repos: url: http://security.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe multiverse + components: main restricted universe distributions: noble-security mirror: true mode: verbatim @@ -109,7 +109,7 @@ deb_package_repos: url: http://ports.ubuntu.com/ubuntu-ports policy: immediate architectures: arm64 - components: main restricted universe multiverse + components: main restricted universe distributions: noble noble-updates noble-backports noble-security mirror: true mode: verbatim diff --git a/ansible/inventory/group_vars/all/package-repos-deprecated b/ansible/inventory/group_vars/all/package-repos-deprecated index 7ed6b2a9..13a4c6d5 100644 --- a/ansible/inventory/group_vars/all/package-repos-deprecated +++ b/ansible/inventory/group_vars/all/package-repos-deprecated @@ -30,7 +30,7 @@ deprecated_deb_package_repos: url: http://archive.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe multiverse + components: main restricted universe # NOTE: Include focal-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 @@ -50,7 +50,7 @@ deprecated_deb_package_repos: url: http://security.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe multiverse + components: main restricted universe distributions: focal-security mirror: true mode: verbatim From c9d5597ef56f6d57d5f10cbf09266f11f673efe2 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Fri, 12 Jun 2026 13:58:07 +0100 Subject: [PATCH 2/2] reverse deprecated repos changes --- ansible/inventory/group_vars/all/package-repos-deprecated | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/inventory/group_vars/all/package-repos-deprecated b/ansible/inventory/group_vars/all/package-repos-deprecated index 13a4c6d5..7ed6b2a9 100644 --- a/ansible/inventory/group_vars/all/package-repos-deprecated +++ b/ansible/inventory/group_vars/all/package-repos-deprecated @@ -30,7 +30,7 @@ deprecated_deb_package_repos: url: http://archive.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe + components: main restricted universe multiverse # NOTE: Include focal-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 @@ -50,7 +50,7 @@ deprecated_deb_package_repos: url: http://security.ubuntu.com/ubuntu policy: immediate architectures: amd64 - components: main restricted universe + components: main restricted universe multiverse distributions: focal-security mirror: true mode: verbatim