Make a publish-docs-draft base job

We need a few different jobs that publish to docs-draft. Make a base
job that can be used for that purpose. This lets us move the definition
of openstack-doc-build back to openstack-zuul-jobs if we want, or we can
leave it where it is.

Use the same playbooks as for publish-openstack-docs. The only
difference was that the docs-draft stuff was fetching to /docs-draft/
instead of to /artifacts/ - and that's just a temporary location.

Move the tox envlist and command line into the run playbook. We don't
want those overridden. However, whether or not this uses constraints
(openstack does, infra doesn't) needs to be settable in child jobs.

Change-Id: I7737235ae265bcd19616adec3be921b78df579c4
This commit is contained in:
Monty Taylor 2017-09-16 14:26:48 -05:00
parent 4d2d59be23
commit 273ec5be16
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
6 changed files with 14 additions and 34 deletions

View File

@ -1,6 +0,0 @@
- hosts: all
roles:
- 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 }}/docs-draft"

View File

@ -1,7 +0,0 @@
- hosts: all
roles:
- role: bindep
bindep_profile: test
bindep_dir: "src/{{ zuul.project.canonical_name }}"
- revoke-sudo
- ensure-tox

View File

@ -1,6 +0,0 @@
- hosts: all
roles:
- role: tox
tox_upper_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
tox_envlist: venv
tox_extra_args: -vv python setup.py build_sphinx

View File

@ -18,5 +18,5 @@
- name: Upload docs to log site_docs_draft
synchronize:
src: "{{ zuul.executor.work_root }}/docs-draft/"
src: "{{ zuul.executor.work_root }}/artifacts/"
dest: "{{ fileserver.path }}/{{ zuul_log_path }}/"

View File

@ -1,3 +1,5 @@
- hosts: all
roles:
- role: tox
tox_envlist: venv
tox_extra_args: -vv python setup.py build_sphinx

View File

@ -392,19 +392,22 @@
- gpg_key
- job:
name: openstack-doc-build
pre-run: playbooks/openstack-doc-build/pre
run: playbooks/openstack-doc-build/run
post-run:
- playbooks/openstack-doc-build/post
- playbooks/publish/openstack-docs-draft
required-projects:
- name: openstack/requirements
name: publish-docs-draft
post-run: playbooks/publish/openstack-docs-draft
roles:
- zuul: openstack-infra/zuul-jobs
secrets:
- secret: site_docs_draft
name: fileserver
- job:
name: openstack-doc-build
parent: publish-docs-draft
pre-run: playbooks/python-docs/pre
run: playbooks/python-docs/run
post-run: playbooks/python-docs/post
required-projects:
- name: openstack/requirements
vars:
tox_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
@ -426,8 +429,6 @@
- zuul: openstack-infra/openstack-zuul-jobs
vars:
tox_upper_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
tox_envlist: venv
tox_extra_args: -vv python setup.py build_sphinx
# NOTE(pabelanger): We have related untrusted job in openstack-zuul-jobs called
# openstack-doc-build. We should discuss post PTG how to potentially deal with
@ -440,15 +441,11 @@
pre-run: playbooks/python-docs/pre
run: playbooks/python-docs/run
post-run: playbooks/python-docs/post-infra
required-projects:
- name: openstack/requirements
roles:
- zuul: openstack-infra/zuul-jobs
- zuul: openstack-infra/openstack-zuul-jobs
vars:
tox_upper_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
tox_envlist: venv
tox_extra_args: -vv python setup.py build_sphinx
- job:
name: publish-openstack-python-branch-tarball