Merge "Move PIP_* env variables to ARG and config"

2 files changed, 9 insertions, 28 deletions

diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index 99791da0f..47cfba466 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -62,6 +62,15 @@
       when:
         - not publisher
 
+    - name: Set pip mirror config
+      vars:
+        kolla_pip_mirror_config:
+          DEFAULT:
+            pip_index_url: "{{ nodepool_pypi_mirror }}"
+            pip_trusted_host: "{{ nodepool_mirror_host }}"
+      ansible.builtin.set_fact:
+        kolla_build_config: "{{ kolla_build_config | combine(kolla_pip_mirror_config, recursive=True) }}"
+
     - name: Set up base repo overrides
       vars:
         kolla_repos_yaml_config:
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 3baa8d704..64b3d0f6e 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -1,31 +1,3 @@
 {% raw %}
 {% extends parent_template %}
-
-{% block base_pip_conf %}
-{% endraw %}
-
-ENV PIP_INDEX_URL {{ nodepool_pypi_mirror }}
-ENV PIP_TRUSTED_HOST {{ nodepool_mirror_host }}
-{% if use_infra_wheels_mirror | default(true) %}
-ENV PIP_EXTRA_INDEX_URL {{ nodepool_wheel_mirror }}
-{% endif %}
-
-{% raw %}
-{% endblock %}
-{% endraw %}
-
-{# Revert to upstream mirrors after build is complete #}
-
-{% raw %}
-{% block footer %}
-{% endraw %}
-
-ENV PIP_INDEX_URL=
-ENV PIP_TRUSTED_HOST=
-{% if use_infra_wheels_mirror | default(true) %}
-ENV PIP_EXTRA_INDEX_URL=
-{% endif %}
-
-{% raw %}
-{% endblock %}
 {% endraw %}