Use sphinx_output_suffix

Add "/" to sphinx dir to to remove the final "html" from path to fix
publishing.

Also, add "/" to playbooks/publish/publications.yaml.

Change-Id: Ie90b3204b2530c30468a28f107f74794235a0921
Depends-On: I0eed5ebf5af8d43f6a105a1fc0dcf1b0a9813dbd
This commit is contained in:
Andreas Jaeger 2018-01-02 19:50:39 +01:00
parent b626de4b85
commit c1400d61cb
12 changed files with 12 additions and 1 deletions

View File

@ -3,6 +3,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -3,6 +3,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -3,6 +3,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -5,6 +5,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -5,6 +5,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -1,6 +1,7 @@
- hosts: all
roles:
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -3,6 +3,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -1,7 +1,7 @@
- hosts: all
roles:
- role: fetch-sphinx-output
sphinx_output_src: "{{ zuul.project.src_dir }}/_out"
sphinx_output_src: "{{ zuul.project.src_dir }}/_out/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -3,6 +3,7 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -3,5 +3,6 @@
- role: write-root-marker
when: zuul_success | bool
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
when: zuul_success | bool

View File

@ -2,4 +2,5 @@
roles:
- prepare-infra-docs-for-afs
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"

View File

@ -2,4 +2,5 @@
roles:
- prepare-docs-for-afs
- role: fetch-sphinx-output
sphinx_output_suffix: "/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"