Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions etc/kayobe/kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ kolla_build_blocks:
{% endfor %}
{% else %}
RUN \
rm /etc/apt/sources.list && \
rm -f /etc/apt/sources.list && \
rm -f /etc/apt/sources.list.d/* && \
{% if stackhpc_repo_mirror_auth_proxy_enabled | bool %}
{# We lack the ca-certificates package at this stage, so don't verify the CA initially #}
echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/90no-verify-peer && \
Expand Down Expand Up @@ -305,7 +306,8 @@ kolla_build_blocks:
COPY sources.list.ubuntu /etc/apt/sources.list.backup
{% endif %}
RUN \
rm /etc/apt/sources.list && \
rm -f /etc/apt/sources.list && \
rm -f /etc/apt/sources.list.d/* && \
rm -f /etc/apt/apt.conf.d/90no-verify-peer && \
{% for repo in stackhpc_ubuntu_noble_repos %}
echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/fix-ubuntu-sources-12be12aa9853b7b0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
fixes:
- |
This update addresses a packaging issue introduced with Ubuntu Noble.
The default Apt repository sources now use .sources files in deb822 format,
stored under /etc/apt/sources.list.d/ubuntu.sources.
The change ensures that all build sources, regardless of format are correctly removed during cleanup.
Loading