Fix publish infra docs index job

This job, like the specs site index, uses a custom tox env rather
than the normal way docs are built (largely on account of
project-config not having a setup.py).  It writes the output to
a custom location as well.  We are unable to use the normal infra
afs docs playbooks due to that, as well as the branch switching
logic not applying.  Let's drop the infra-docs post playbook
from this job and add the only parts we need from it, the
root-marker and fetch roles, to the post playbook unique to this
job.

Change-Id: I20db51fe80c633a217cbdc1f7bd7f8a47af27002
Depends-On: Ia6c6257cb1479abef79bf919cb6ad25ea6828d90
This commit is contained in:
James E. Blair 2017-09-27 15:56:54 -07:00
parent 4102e7b6ab
commit d46b5c77f4
3 changed files with 11 additions and 2 deletions

View File

@ -0,0 +1,4 @@
- hosts: all
roles:
- role: tox
tox_envlist: infra-docs

View File

@ -1,5 +1,11 @@
- hosts: localhost
roles:
- fetch-tox-output
- role: write-root-marker
doc_build_dir: "src/{{ zuul.project.canonical_name }}/docs-site/output"
- role: fetch-sphinx-output
sphinx_output_src: "src/{{ zuul.project.canonical_name }}/docs-site/output/"
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
- create-afs-token
- role: upload-afs
afs_target: "{{ afs.path }}/infra"

View File

@ -198,9 +198,8 @@
Publish the results of the tox-docs job to /afs/.openstack.org/infra
final: True
pre-run: playbooks/python-docs/pre
run: playbooks/python-docs/run
run: playbooks/docs-infra-index/run
post-run:
- playbooks/python-docs/post-infra
- playbooks/publish/infra-index
roles:
- zuul: openstack-infra/zuul-jobs