From 56b9c68ba23d7f9767142755bfe456550cb3511b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 16 Aug 2019 15:39:59 +0200 Subject: [PATCH] Remove sphinx_output_dir this is a partial revert of Ifd270cbc2d4bd42418b89a3b3061748ce537ae42, we do not need sphinx_output_dir anymore, the single use that needed it has been changed. Change-Id: I95543b1a56c04dbfb8591612e4c48be0d8631633 --- roles/fetch-sphinx-output/README.rst | 9 +-------- roles/fetch-sphinx-output/defaults/main.yaml | 3 +-- roles/fetch-sphinx-output/tasks/main.yaml | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/roles/fetch-sphinx-output/README.rst b/roles/fetch-sphinx-output/README.rst index 1f2bca353..3f84dd994 100644 --- a/roles/fetch-sphinx-output/README.rst +++ b/roles/fetch-sphinx-output/README.rst @@ -16,13 +16,6 @@ to the log root of the executor. Directory relative to zuul_work_dir where build output will be put. -.. zuul:rolevar:: sphinx_output_dir - :default: html - - Directory relative to sphinx_build_dir where sphinx output will be - put. Unlike sphinx_build_dir, this will appear in the destination - directory and returned artifact URLs. - .. zuul:rolevar:: sphinx_output_suffix :default: '' @@ -31,7 +24,7 @@ to the log root of the executor. from the original path. .. zuul:rolevar:: sphinx_output_src - :default: {{ zuul_work_dir }}/{{ sphinx_build_dir }}/{{ sphinx_output_dir }}{{ sphinx_output_suffix }} + :default: {{ zuul_work_dir }}/{{ sphinx_build_dir }}/html{{ sphinx_output_suffix }} The location on the worker from which to fetch the generated sphinx content. By default, the HTML doc build dir of the current diff --git a/roles/fetch-sphinx-output/defaults/main.yaml b/roles/fetch-sphinx-output/defaults/main.yaml index 9278b9e26..33c0a57e2 100644 --- a/roles/fetch-sphinx-output/defaults/main.yaml +++ b/roles/fetch-sphinx-output/defaults/main.yaml @@ -3,5 +3,4 @@ zuul_executor_dest: "{{ zuul.executor.log_root }}" zuul_work_dir: "{{ zuul.project.src_dir }}" sphinx_build_dir: doc/build sphinx_output_suffix: "" -sphinx_output_dir: "html" -sphinx_output_src: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}/{{ sphinx_output_dir }}{{ sphinx_output_suffix }}" +sphinx_output_src: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}/html{{ sphinx_output_suffix }}" diff --git a/roles/fetch-sphinx-output/tasks/main.yaml b/roles/fetch-sphinx-output/tasks/main.yaml index ea6784bf3..d545b01ba 100644 --- a/roles/fetch-sphinx-output/tasks/main.yaml +++ b/roles/fetch-sphinx-output/tasks/main.yaml @@ -11,6 +11,6 @@ zuul: artifacts: - name: "Docs preview site" - url: "{{ sphinx_output_dir }}/" + url: "html/" metadata: type: docs_site