From 3a9b3e194cbcc8370c2a142027ecaedda61d6edc Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Wed, 16 Oct 2019 11:36:29 -0400 Subject: [PATCH] Remove unused k8s log config The entries being removed are not used for k8s functional testing and resulted in an empty directory. Change-Id: I3d86e2d0f49917299f1f332339382e57277820b4 --- playbooks/nodepool-functional-k8s/post.yaml | 15 +-------------- playbooks/nodepool-functional-k8s/pre.yaml | 10 ---------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/playbooks/nodepool-functional-k8s/post.yaml b/playbooks/nodepool-functional-k8s/post.yaml index 9a5f404d8..a760972b0 100644 --- a/playbooks/nodepool-functional-k8s/post.yaml +++ b/playbooks/nodepool-functional-k8s/post.yaml @@ -1,21 +1,8 @@ - hosts: all vars: - nodepool_log_dir: '{{ ansible_user_dir }}/work/logs/nodepool' - nodepool_etc_dir: '{{ ansible_user_dir }}/work/etc' minikube_log: '{{ ansible_user_dir }}/zuul-output/logs/minikube.txt' + tasks: - - name: 'Copy files from {{ nodepool_log_dir }}' - synchronize: - src: '{{ nodepool_log_dir }}' - dest: '{{ zuul.executor.log_root }}/{{ inventory_hostname }}' - mode: pull - - - name: 'Copy files from {{ nodepool_etc_dir }}' - synchronize: - src: '{{ nodepool_etc_dir }}' - dest: '{{ zuul.executor.log_root }}/{{ inventory_hostname }}' - mode: pull - - name: Produce minikube log become: yes shell: '/tmp/minikube logs > {{ minikube_log }}' diff --git a/playbooks/nodepool-functional-k8s/pre.yaml b/playbooks/nodepool-functional-k8s/pre.yaml index 8de8ad1b4..6581587c1 100644 --- a/playbooks/nodepool-functional-k8s/pre.yaml +++ b/playbooks/nodepool-functional-k8s/pre.yaml @@ -3,13 +3,3 @@ - role: bindep - role: install-kubernetes docker_version: 18.06.1~ce~3-0~ubuntu - - tasks: - - name: Ensure nodepool services directories - file: - path: '{{ ansible_user_dir }}/work/{{ item }}' - state: directory - with_items: - - logs/nodepool - - etc - - images