From cc59ca16abe569d5bf5252fa1b0d167fc6bd1740 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 31 Aug 2017 19:21:23 -0400 Subject: [PATCH] Allow user to select source directory in fetch-sphinx-output It is possible doc/build/html is not the output path for sphinx. So default to it but allow a user to override the value. Change-Id: Ifdb258a9342216d9a2ea0162d7d00dbf0ad7fdeb Signed-off-by: Paul Belanger --- roles/fetch-sphinx-output/defaults/main.yaml | 2 +- roles/fetch-sphinx-output/tasks/main.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/fetch-sphinx-output/defaults/main.yaml b/roles/fetch-sphinx-output/defaults/main.yaml index d9af43f1e..b900d6ccb 100644 --- a/roles/fetch-sphinx-output/defaults/main.yaml +++ b/roles/fetch-sphinx-output/defaults/main.yaml @@ -1,3 +1,3 @@ --- zuul_executor_dest: "{{ zuul.executor.log_root }}" -zuul_work_dir: "src/{{ zuul.project.canonical_name }}" +sphinx_output_src: "src/{{ zuul.project.canonical_name }}/doc/build/html" diff --git a/roles/fetch-sphinx-output/tasks/main.yaml b/roles/fetch-sphinx-output/tasks/main.yaml index 6c7660a39..615279994 100644 --- a/roles/fetch-sphinx-output/tasks/main.yaml +++ b/roles/fetch-sphinx-output/tasks/main.yaml @@ -2,5 +2,5 @@ synchronize: dest: "{{ zuul_executor_dest }}" mode: pull - src: "{{ zuul_work_dir }}/doc/build/html" + src: "{{ sphinx_output_src }}" verify_host: true