From 68ee0780beeda9202d911ab8afccd30fa5d7e798 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Fri, 21 Jul 2017 09:42:25 +0200 Subject: [PATCH] Rename uuid to build In change If9ebdc783dcef4f8dea9fa491b40ae49416e5cf1 in zuul uuid was renamed to build. This must be also reflected here. Change-Id: I46101d7a9ecc1513647f19d1d377480d5afa9a5d --- roles/add-build-sshkey/vars/main.yml | 2 +- roles/remove-build-sshkey/vars/main.yml | 2 +- roles/upload-logs/tasks/main.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/add-build-sshkey/vars/main.yml b/roles/add-build-sshkey/vars/main.yml index 58092cb5b..a9a38c8ed 100644 --- a/roles/add-build-sshkey/vars/main.yml +++ b/roles/add-build-sshkey/vars/main.yml @@ -1 +1 @@ -zuul_temp_ssh_key: "{{ zuul.executor.src_root }}/../{{ zuul.uuid }}_id_rsa" +zuul_temp_ssh_key: "{{ zuul.executor.src_root }}/../{{ zuul.build }}_id_rsa" diff --git a/roles/remove-build-sshkey/vars/main.yml b/roles/remove-build-sshkey/vars/main.yml index 58092cb5b..a9a38c8ed 100644 --- a/roles/remove-build-sshkey/vars/main.yml +++ b/roles/remove-build-sshkey/vars/main.yml @@ -1 +1 @@ -zuul_temp_ssh_key: "{{ zuul.executor.src_root }}/../{{ zuul.uuid }}_id_rsa" +zuul_temp_ssh_key: "{{ zuul.executor.src_root }}/../{{ zuul.build }}_id_rsa" diff --git a/roles/upload-logs/tasks/main.yaml b/roles/upload-logs/tasks/main.yaml index 5d462dd93..92894fae3 100644 --- a/roles/upload-logs/tasks/main.yaml +++ b/roles/upload-logs/tasks/main.yaml @@ -1,12 +1,12 @@ - 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.job }}/{{ zuul.uuid[:7] }}" + log_path: "{{ zuul.change[-2:] }}/{{ zuul.change }}/{{ zuul.patchset }}/{{ zuul.pipeline }}/{{ zuul.job }}/{{ zuul.build[:7] }}" - 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.job }}/{{ zuul.uuid[:7] }}" + log_path: "{{ zuul.newrev[-2:] }}/{{ zuul.newrev }}/{{ zuul.pipeline }}/{{ zuul.job }}/{{ zuul.build[:7] }}" - name: Create log directories file: