[libvirt-jenkins-ci PATCH 2/7] lcitool: Configure ccache using environment variables

We're going to stop creating $HOME/.ccache soon, so we need an alternative way to configure ccache; environment variables work perfectly fine. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- guests/playbooks/update/tasks/users.yml | 7 ------- guests/playbooks/update/templates/bashrc.j2 | 1 + guests/playbooks/update/templates/ccache.conf.j2 | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 guests/playbooks/update/templates/ccache.conf.j2 diff --git a/guests/playbooks/update/tasks/users.yml b/guests/playbooks/update/tasks/users.yml index 5d202b3..931d79b 100644 --- a/guests/playbooks/update/tasks/users.yml +++ b/guests/playbooks/update/tasks/users.yml @@ -63,13 +63,6 @@ - ccache - ccache/bin -- name: '{{ flavor }}: Configure ccache' - template: - src: '{{ playbook_base }}/templates/ccache.conf.j2' - dest: /home/{{ flavor }}/.ccache/ccache.conf - owner: '{{ flavor }}' - group: '{{ flavor }}' - - name: '{{ flavor }}: Create ccache wrappers' file: src: '{{ ccache }}' diff --git a/guests/playbooks/update/templates/bashrc.j2 b/guests/playbooks/update/templates/bashrc.j2 index 9cea90c..898d30b 100644 --- a/guests/playbooks/update/templates/bashrc.j2 +++ b/guests/playbooks/update/templates/bashrc.j2 @@ -5,6 +5,7 @@ export NINJA="{{ ninja }}" export PYTHON="{{ python }}" export MAKEFLAGS="-j{{ install_vcpus|int + 1 }}" +export CCACHE_MAXSIZE="2G" export VIRT_PREFIX="$HOME/build/libvirt" export PATH="$VIRT_PREFIX/bin:$HOME/.ccache/bin:$PATH" diff --git a/guests/playbooks/update/templates/ccache.conf.j2 b/guests/playbooks/update/templates/ccache.conf.j2 deleted file mode 100644 index 48c3756..0000000 --- a/guests/playbooks/update/templates/ccache.conf.j2 +++ /dev/null @@ -1 +0,0 @@ -max_size = 2G -- 2.25.1