summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-11-24 15:28:39 +0000
committerGerrit Code Review <review@openstack.org>2020-11-24 15:28:39 +0000
commit3c68a4f912c03e3e31aee00e95fea8d07f665561 (patch)
treee1424e2ce1c94ee4951bed7a021fa710e42eac5c
parent1528c81f1d44acf10b75366ee546cad6461e185c (diff)
parent09c890b12463a4b2c8767231189e7016f337fbc3 (diff)
downloadkolla-3c68a4f912c03e3e31aee00e95fea8d07f665561.tar.gz
kolla-3c68a4f912c03e3e31aee00e95fea8d07f665561.zip
Merge "CI: add templated Dockerfiles to build logs"
-rw-r--r--.zuul.d/base.yaml1
-rw-r--r--tests/playbooks/run.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 5a0dd9c15..45e95ed9d 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -89,6 +89,7 @@
extra-vars:
kolla_logs_dir: "{{ zuul_output_dir }}/logs/kolla"
kolla_build_logs_dir: "{{ kolla_logs_dir }}/build"
+ kolla_work_dir: "{{ kolla_logs_dir }}"
virtualenv_path: "/tmp/kolla-virtualenv"
- job:
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index d1da0c9f4..e71b7b17d 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -14,6 +14,7 @@
# NOTE(yoctozepto): to avoid issues with IPv6 not enabled in the docker daemon
# and since we don't need isolated networks here, use host networking
network_mode: host
+ work_dir: "{{ kolla_work_dir }}"
tasks:
- name: Ensure /etc/kolla exists
file: