From 580ef98b21b4cd4380d0df7672271b499446f9f5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 6 Sep 2017 13:45:17 -0400 Subject: [PATCH] Rework publish-openstack-python-docs(-infra) job We need 2 different post-runs playbooks for publishing AFS artifacts, because infra and openstack projects are currently different. Post PTG, we can work to align openstack-infra jobs doc publishing with openstack, if possible. Change-Id: Ia51320f897445907b5e81aa4bf0d54a04ef6f8d5 Depends-On: I879d42cd04ab051b91c0b636856470cd4126b6f2 Signed-off-by: Paul Belanger --- playbooks/python-docs/post-infra.yaml | 7 +++++++ playbooks/python-docs/post.yaml | 2 +- zuul.yaml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 playbooks/python-docs/post-infra.yaml diff --git a/playbooks/python-docs/post-infra.yaml b/playbooks/python-docs/post-infra.yaml new file mode 100644 index 0000000000..1f6a331e5b --- /dev/null +++ b/playbooks/python-docs/post-infra.yaml @@ -0,0 +1,7 @@ +- hosts: all + roles: + - prepare-infra-docs-for-afs + - fetch-tox-output + - role: fetch-sphinx-output + sphinx_output_src: "src/{{ zuul.project.canonical_name }}/doc/build/html/" + zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts" diff --git a/playbooks/python-docs/post.yaml b/playbooks/python-docs/post.yaml index 1f6a331e5b..0881f9f110 100644 --- a/playbooks/python-docs/post.yaml +++ b/playbooks/python-docs/post.yaml @@ -1,6 +1,6 @@ - hosts: all roles: - - prepare-infra-docs-for-afs + - prepare-docs-for-afs - fetch-tox-output - role: fetch-sphinx-output sphinx_output_src: "src/{{ zuul.project.canonical_name }}/doc/build/html/" diff --git a/zuul.yaml b/zuul.yaml index 3e0aab9f29..a3d6f1ac91 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -247,7 +247,7 @@ Publish the results of the tox-docs job to /afs/.openstack.org/docs pre-run: playbooks/python-docs/pre run: playbooks/python-docs/run - post-run: playbooks/python-docs/post + post-run: playbooks/python-docs/post-infra required-projects: - name: openstack/requirements roles: