Merge "[2024.1 only] Add conditionals for Ubuntu Jammy" into stable/2024.1

Author: Zuul

docker/base/Dockerfile.j2

@@ -240,19 +240,23 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \
 {% if base_distro == 'debian' %}
 RUN rm -f /etc/apt/sources.list.d/debian.sources
 COPY sources.list.{{ base_distro }} /etc/apt/sources.list
-{% elif ( base_distro == 'ubuntu' and base_arch == 'x86_64' ) %}
+{% elif base_distro == 'ubuntu' %}
 {% if base_distro_tag.startswith('22.04') or base_distro_tag.startswith('jammy') %}
+RUN rm -f /etc/apt/sources.list
+{% if base_arch == 'x86_64' %}
 COPY sources.list.{{ base_distro }}.jammy /etc/apt/sources.list
+{% else %}
+COPY sources.list.{{ base_distro }}.jammy.{{ base_arch }} /etc/apt/sources.list
+{% endif %}
 {% elif base_distro_tag.startswith('24.04') or base_distro_tag.startswith('noble') %}
+RUN rm -f /etc/apt/sources.list.d/{{ base_distro }}.sources
+{% if base_arch == 'x86_64' %}
 COPY sources.list.{{ base_distro }}.noble /etc/apt/sources.list
-{% endif %}
 {% else %}
-{% if base_distro_tag.startswith('22.04')  or base_distro_tag.startswith('jammy')%}
-COPY sources.list.{{ base_distro }}.jammy.{{ base_arch }} /etc/apt/sources.list
-{% elif base_distro_tag.startswith('24.04') or base_distro_tag.startswith('noble')%}
 COPY sources.list.{{ base_distro }}.noble.{{ base_arch }} /etc/apt/sources.list
 {% endif %}
 {% endif %}
+{% endif %}
 COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
 {% endblock %}