zuul/zuul-jobs
Code Issues Proposed changes

Fix sphinx publishing

Browse Source 
Since change I9ed0b02d6ca20a6b679507c4d988531abc55b09d merged, we were
publishing to docs.o.o/$project/latest/html instead of
docs.o.o/$project/latest . We need to remove the final html part when
using rsync. Add an option to allow appending "/" to sphinx_output_src
so that rsync copies the content without the final html.

Change-Id: I0eed5ebf5af8d43f6a105a1fc0dcf1b0a9813dbd
This commit is contained in:
Andreas Jaeger 2018-01-02 19:41:58 +01:00 committed by Clark Boylan
parent 8b0f255f0d
commit 8493e6ad92
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/fetch-sphinx-output/README.rst
View File

@ -16,8 +16,15 @@ to the log root of the executor.
Directory relative to zuul_work_dir where build output will be put. Directory relative to zuul_work_dir where build output will be put.
.. zuul:rolevar:: sphinx_output_suffix
:default: ''
Suffix to use for constructing the path. This is normally an
empty string. If set to '/' then, rsync will remove the last part
from the original path.
.. zuul:rolevar:: sphinx_output_src .. zuul:rolevar:: sphinx_output_src
:default: {{ zuul_work_dir }}/{{ sphinx_build_dir }}/html :default: {{ zuul_work_dir }}/{{ sphinx_build_dir }}/html{{ sphinx_output_suffix }}
The location on the worker from which to fetch the generated sphinx The location on the worker from which to fetch the generated sphinx
content. By default, the HTML doc build dir of the current content. By default, the HTML doc build dir of the current

3
roles/fetch-sphinx-output/defaults/main.yaml
View File

@ -2,4 +2,5 @@
zuul_executor_dest: "{{ zuul.executor.log_root }}" zuul_executor_dest: "{{ zuul.executor.log_root }}"
zuul_work_dir: "{{ zuul.project.src_dir }}" zuul_work_dir: "{{ zuul.project.src_dir }}"
sphinx_build_dir: doc/build sphinx_build_dir: doc/build
sphinx_output_src: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}/html" sphinx_output_suffix: ""
sphinx_output_src: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}/html{{ sphinx_output_suffix }}"