diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-04 16:31:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-04 16:31:27 +0000 |
| commit | baec0b913af06239f0b83efc6ee71ceccba802a7 (patch) | |
| tree | 82debb1d1be0d0bf95f367c4b43a3ef9516a8c2d /tests/templates | |
| parent | 4905a1ca6cf54993c3c0c80c0e7a808752294a58 (diff) | |
| parent | c089eab392de39ff01f9eba65ef4855a14e2076a (diff) | |
| download | kolla-baec0b913af06239f0b83efc6ee71ceccba802a7.tar.gz kolla-baec0b913af06239f0b83efc6ee71ceccba802a7.zip | |
Merge "CI: Avoid tox"
Diffstat (limited to 'tests/templates')
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 5 |
1 files changed, 5 insertions, 0 deletions
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 |
