From 665357248d83b3a752ff81338b571c83f2a1dbdb Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 17 May 2023 16:29:34 +0200 Subject: [PATCH] ubuntu: use Antelope UCA Skip using the mirror for now, given the OpenDev AFS space issues. Change-Id: I8e55c699e493494b3e5c908c7e8c370ce992fdf5 --- docker/base/sources.list.ubuntu | 2 +- docker/base/sources.list.ubuntu.aarch64 | 2 +- tests/templates/template_overrides.j2 | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 3294224aad..9b38e06edb 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -10,7 +10,7 @@ deb http://archive.ubuntu.com/ubuntu/ jammy-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/zed main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/antelope 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 a971fb52aa..bb2392cb64 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -8,7 +8,7 @@ deb http://ports.ubuntu.com/ jammy-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/zed main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/antelope 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/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 7318556cdf..cc968e2902 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -80,7 +80,6 @@ RUN sed -i -e "s|http://deb.debian.org|[trusted=yes] http://{{ nodepool_mirror_h {% elif base_distro == "ubuntu" %} RUN sed -i -e "s|mirror://mirrors.ubuntu.com/mirrors.txt|[trusted=yes] http://{{ nodepool_mirror_host }}/ubuntu/|" \ - -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|[trusted=yes] http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \ -e "s|http://ports.ubuntu.com|[trusted=yes] http://{{ nodepool_mirror_host }}/ubuntu-ports|" \ /etc/apt/sources.list