From c089eab392de39ff01f9eba65ef4855a14e2076a Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Sun, 15 Mar 2020 15:36:47 +0100 Subject: CI: Avoid tox We don't need tox nor tell our users to use it when doing kolla builds. Tox is going away from base infra images (it is already gone from aarch64 ones). Depends-on: https://review.opendev.org/713134 Co-authored-by: Marcin Juszkiewicz Change-Id: Ib1d97a783951ac42740ebf91bcc6ecaf2bf70853 --- tests/templates/kolla-build.conf.j2 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/templates') diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index d707f5f87..cb1c18499 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -5,6 +5,11 @@ namespace = kolla {% set tag_suffix = '-aarch64' if ansible_architecture == 'aarch64' else '' %} tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }} {% endif %} +base = {{ base_distro }} +{% if base_tag is defined %} +base_tag = {{ base_tag }} +{% endif %} +install_type = {{ install_type }} push = false logs_dir = {{ kolla_build_logs_dir }} template_override = /etc/kolla/template_overrides.j2 -- cgit v1.2.3