Add cleanup_repos to revert build_only overrides

Repos marked build_only: true are backed up before handle_repos()
overwrites them and restored at the end of each image build, so CI
mirror URLs are not baked into the final image.

The cleanup RUN was injected into every Dockerfile, not just images
that called handle_repos() for those repos. Child images with no
backup fell through to "rm -f", deleting the inherited repo file
(e.g. debian.sources in bifrost-base, breaking cpio install).

Fix by adding a {repo}.enabled sentinel that handle_repos creates
when it processes a build_only repo, making the cleanup conditional
on that sentinel.

Change-Id: Ie5b9970a4575b6258dc238059d3f33ddfe155789
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

6 files changed, 18 insertions, 0 deletions

diff --git a/kolla/docker/ovn/ovn-base/Dockerfile.j2 b/kolla/docker/ovn/ovn-base/Dockerfile.j2
index 3efd001a3..9ab9f0aa6 100644
--- a/kolla/docker/ovn/ovn-base/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-base/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.kolla_enable_base_repos() }}
+
 {% if base_package_type == 'rpm' %}
     {% set ovn_base_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}',
@@ -27,3 +29,4 @@ RUN chmod 644 /usr/local/bin/kolla_extend_start
 {{ macros.kolla_patch_sources() }}
 
 {% block ovn_base_footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/ovn/ovn-controller/Dockerfile.j2 b/kolla/docker/ovn/ovn-controller/Dockerfile.j2
index f95e61fee..a04562107 100644
--- a/kolla/docker/ovn/ovn-controller/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-controller/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.kolla_enable_base_repos() }}
+
 {% if base_package_type == 'rpm' %}
     {% set ovn_controller_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-host'
@@ -27,3 +29,4 @@ RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 
 {% block ovn_controller_footer %}{% endblock %}
 {% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
index ea6a53249..932d7a5d7 100644
--- a/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.kolla_enable_base_repos() }}
+
 {% if base_package_type == 'rpm' %}
     {% set ovn_nb_db_server_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-central',
@@ -29,3 +31,4 @@ RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 
 {% block ovn_nb_db_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/ovn/ovn-northd/Dockerfile.j2 b/kolla/docker/ovn/ovn-northd/Dockerfile.j2
index 4a15e10eb..227584ed4 100644
--- a/kolla/docker/ovn/ovn-northd/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-northd/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.kolla_enable_base_repos() }}
+
 {% if base_package_type == 'rpm' %}
     {% set ovn_northd_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-central',
@@ -27,3 +29,4 @@ RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 
 {% block ovn_northd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2 b/kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
index 427b6f7f1..1d1761033 100644
--- a/kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2
@@ -5,6 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% block ovn_sb_db_server_header %}{% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% block ovn_sb_db_relay_ovn_ctl %}
 {# TODO(mnasiadka): Switch to 25.03 branch when available, ideally rpm/deb packages will be
                     available. #}
@@ -14,5 +16,6 @@ RUN curl -o /usr/share/ovn/scripts/ovn-ctl https://raw.githubusercontent.com/ovn
 COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
 RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 
+{{ macros.kolla_patch_sources() }}
 {% block ovn_sb_db_relay_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
index afceb8173..fbef63713 100644
--- a/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.kolla_enable_base_repos() }}
+
 {% if base_package_type == 'rpm' %}
     {% set ovn_sb_db_server_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-central',
@@ -29,3 +31,4 @@ RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 
 {% block ovn_sb_db_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}