From c5f3f23e05a901bf2663184f13c137e46d71f507 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Thu, 2 Nov 2023 01:44:32 +0100 Subject: [PATCH] [podman] Fix cross dependency image build When the kolla-ansible project has a cross dependency on the kolla project, CI have to build an image from that change locally. However, Podman refuses to push to localhost, so it is necessary to set the local repo as insecure for the test. Change-Id: I786b22ff0cd581f90ba4bec08842651a6509a745 --- tests/run.yml | 2 +- tests/templates/globals-default.j2 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/run.yml b/tests/run.yml index 90e36bad86..a396c85738 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -58,7 +58,7 @@ # buster see https://github.com/docker/for-linux/issues/711. push: "{{ base_distro != 'debian' }}" base: "{{ base_distro }}" - registry: "127.0.0.1:4000" + registry: "primary:4000" namespace: lokolla tag: "{{ build_image_tag }}" template_override: /etc/kolla/template_overrides.j2 diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 17a3125f94..52d32f2198 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -14,6 +14,10 @@ kolla_base_distro: "{{ base_distro }}" network_interface: "{{ api_interface_name }}" network_address_family: "{{ address_family }}" kolla_container_engine: "{{ container_engine }}" +{% if container_engine == 'podman' %} +podman_registry: "primary:4000" +podman_registry_insecure: "yes" +{% endif %} docker_restart_policy: "no" docker_custom_config: debug: true