Skip to content

Commit 6a07622

Browse files
grzegorzkoperAlex-Welsh
authored andcommitted
[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 7017ed1 commit 6a07622

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
@@ -267,7 +267,8 @@ kolla_build_blocks:
267267
{% endfor %}
268268
{% else %}
269269
RUN \
270-
rm /etc/apt/sources.list && \
270+
rm -f /etc/apt/sources.list && \
271+
rm -f /etc/apt/sources.list.d/* && \
271272
{% if stackhpc_repo_mirror_auth_proxy_enabled | bool %}
272273
{# We lack the ca-certificates package at this stage, so don't verify the CA initially #}
273274
echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/90no-verify-peer && \
@@ -305,7 +306,8 @@ kolla_build_blocks:
305306
COPY sources.list.ubuntu /etc/apt/sources.list.backup
306307
{% endif %}
307308
RUN \
308-
rm /etc/apt/sources.list && \
309+
rm -f /etc/apt/sources.list && \
310+
rm -f /etc/apt/sources.list.d/* && \
309311
rm -f /etc/apt/apt.conf.d/90no-verify-peer && \
310312
{% for repo in stackhpc_ubuntu_noble_repos %}
311313
echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \

0 commit comments

Comments
 (0)