From 65a44f24897f5ca7f8aaca81b37580128520c79a Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 28 Jun 2017 14:28:25 -0700 Subject: [PATCH] Fix several issues with upload-logs role Change-Id: I09d4fae4acde6122a890c313eefbbcf4c27ef203 --- roles/upload-logs/tasks/main.yaml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/roles/upload-logs/tasks/main.yaml b/roles/upload-logs/tasks/main.yaml index 5911372..65fccbc 100644 --- a/roles/upload-logs/tasks/main.yaml +++ b/roles/upload-logs/tasks/main.yaml @@ -1,15 +1,22 @@ -- name: Set log path for a change. - when: zuul.change +- name: Set log path for a change + when: zuul.change is defined set_fact: - log_path: "{{ zuul.change[:-2] }}/{{ zuul.change }}/{{ zuul.patchset }}/{{ zuul.pipeline }}/{{ zuul.uuid[:7] }}/" + log_path: "{{ zuul.change[-2:] }}/{{ zuul.change }}/{{ zuul.patchset }}/{{ zuul.pipeline }}/{{ zuul.uuid[:7] }}" -- name: Set log path for a ref update. - when: zuul.newrev +- name: Set log path for a ref update + when: zuul.newrev is defined set_fact: - log_path: "{{ zuul.newrev[:-2] }}/{{ zuul.newrev }}/{{ zuul.pipeline }}/{{ zuul.uuid[:7] }}/" + log_path: "{{ zuul.newrev[-2:] }}/{{ zuul.newrev }}/{{ zuul.pipeline }}/{{ zuul.uuid[:7] }}" -- name: Upload logs to log server. +- name: Create log directories + file: + path: "/srv/static/logs/{{ log_path }}" + state: directory + recurse: yes + mode: 0775 + +- name: Upload logs to log server synchronize: src: "{{ zuul.executor.log_root }}" - dest: "{{ log_path }}" + dest: "/srv/static/logs/{{ log_path }}" no_log: true