From 164cda1c41078eb0f5babc985915732131ed6765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 15 Apr 2022 09:58:14 +0000 Subject: [PATCH] Revert "CI: add templated Dockerfiles to build logs" This reverts commit 09c890b12463a4b2c8767231189e7016f337fbc3. Reason for revert: That change caused all Kolla's work items to be transferred. This includes tarballs, their extracted contents, cloned git repositories, etc. to also be transferred to swift which takes extra time, pollutes logs and decreases the stability of jobs slightly (the mechanism is not designed for this kind of load). The collection of templated Dockerfiles in CI has to be reimplemented if it is wanted. Change-Id: Ideaf66ce18c993802f4d20f490caa47cec0dde5e (cherry picked from commit f33ef03977536ecb29ea464b9e557a6caacf4345) --- .zuul.d/base.yaml | 1 - tests/playbooks/run.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index d630cf100e..bc88cba08b 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -113,7 +113,6 @@ 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 0142c08070..27aebe6a27 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -14,7 +14,6 @@ # 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: