Skip to content

Commit 3e6fcd6

Browse files
committed
[fix] Make sure all the sources from the build are removed
We need to make sure all the sources from kolla build are being removed, because since ubuntu noble: ``` Ubuntu sources have moved to the /etc/apt/sources.list.d/ubuntu.sources file, which uses the deb822 format. Use deb822-formatted .sources files to manage package sources in the /etc/apt/sources.list.d/ directory. See the sources.list(5) manual page for details. ```
1 parent e00d3f7 commit 3e6fcd6

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

etc/kayobe/kolla.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,8 @@ kolla_build_blocks:
259259
{% endfor %}
260260
{% else %}
261261
RUN \
262-
rm /etc/apt/sources.list && \
262+
rm -f /etc/apt/sources.list && \
263+
rm -f /etc/apt/sources.list.d/* && \
263264
{% if stackhpc_repo_mirror_auth_proxy_enabled | bool %}
264265
{# We lack the ca-certificates package at this stage, so don't verify the CA initially #}
265266
echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/90no-verify-peer && \
@@ -291,7 +292,8 @@ kolla_build_blocks:
291292
COPY sources.list.ubuntu /etc/apt/sources.list.backup
292293
{% endif %}
293294
RUN \
294-
rm /etc/apt/sources.list && \
295+
rm -f /etc/apt/sources.list && \
296+
rm -f /etc/apt/sources.list.d/* && \
295297
rm -f /etc/apt/apt.conf.d/90no-verify-peer && \
296298
{% for repo in stackhpc_ubuntu_noble_repos %}
297299
echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \

0 commit comments

Comments
 (0)