From 7d38e96a3817b46a3c2389af45c0fb3727a3620a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 5 Dec 2017 12:54:20 -0600 Subject: [PATCH] Migrate special docs jobs to build-openstack-sphinx-docs The api-ref, api-guide, deploy-guide, install-guide and placement-api-ref docs all are just sphinx docs. Update jobs to use the sphinx base job. Update relevant files list to include the requirements files used. Change-Id: I02e882786677f279c89614c2f5d295153e489a36 --- playbooks/build-api-guide/post.yaml | 5 -- playbooks/build-api-ref/post.yaml | 5 -- playbooks/build-deploy-guide/post.yaml | 5 -- playbooks/build-install-guide/post.yaml | 5 -- playbooks/build-placement-api-ref/post.yaml | 5 -- zuul.d/jobs.yaml | 59 +++++++++------------ 6 files changed, 25 insertions(+), 59 deletions(-) delete mode 100644 playbooks/build-api-guide/post.yaml delete mode 100644 playbooks/build-api-ref/post.yaml delete mode 100644 playbooks/build-deploy-guide/post.yaml delete mode 100644 playbooks/build-install-guide/post.yaml delete mode 100644 playbooks/build-placement-api-ref/post.yaml diff --git a/playbooks/build-api-guide/post.yaml b/playbooks/build-api-guide/post.yaml deleted file mode 100644 index 927a2610..00000000 --- a/playbooks/build-api-guide/post.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - roles: - - role: fetch-tox-output - - role: fetch-sphinx-output - sphinx_output_src: "{{ zuul_work_dir|default(zuul.project.src_dir) }}/api-guide/build/html" diff --git a/playbooks/build-api-ref/post.yaml b/playbooks/build-api-ref/post.yaml deleted file mode 100644 index 045d57c5..00000000 --- a/playbooks/build-api-ref/post.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - roles: - - role: fetch-tox-output - - role: fetch-sphinx-output - sphinx_output_src: "{{ zuul_work_dir|default(zuul.project.src_dir) }}/api-ref/build/html" diff --git a/playbooks/build-deploy-guide/post.yaml b/playbooks/build-deploy-guide/post.yaml deleted file mode 100644 index 4ab00985..00000000 --- a/playbooks/build-deploy-guide/post.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - roles: - - role: fetch-tox-output - - role: fetch-sphinx-output - sphinx_output_src: "{{ zuul.project.src_dir }}/deploy-guide/build/html" diff --git a/playbooks/build-install-guide/post.yaml b/playbooks/build-install-guide/post.yaml deleted file mode 100644 index 461395a0..00000000 --- a/playbooks/build-install-guide/post.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - roles: - - role: fetch-tox-output - - role: fetch-sphinx-output - sphinx_output_src: "{{ zuul.project.src_dir }}/install-guide/build/html" diff --git a/playbooks/build-placement-api-ref/post.yaml b/playbooks/build-placement-api-ref/post.yaml deleted file mode 100644 index 79cb357c..00000000 --- a/playbooks/build-placement-api-ref/post.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - roles: - - role: fetch-tox-output - - role: fetch-sphinx-output - sphinx_output_src: "{{ zuul.project.src_dir }}/placement-api-ref/build/html" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index e5a6941d..00d7c4e2 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -478,100 +478,91 @@ - job: name: build-openstack-api-ref - parent: openstack-tox + parent: build-openstack-sphinx-docs description: | Build api-ref document. This is only run on master branch of a project. - success-url: html/ - post-run: playbooks/build-api-ref/post.yaml timeout: 1800 vars: - tox_envlist: api-ref + sphinx_build_dir: api-ref/build + sphinx_source_dir: api-ref/source # We only publish the master branch, so no need to run # for changes on other branches. branches: master files: - - ^tox.ini$ - ^api-ref/.* - ^doc/api_samples/.* - bindep.txt - - other-requirements.txt + - doc/requirements.txt + - test-requirements.txt - job: name: build-openstack-api-guide - parent: openstack-tox + parent: build-openstack-sphinx-docs description: | Build api-guide document. This is only run for changes on master branch of a project. - success-url: html/ - post-run: playbooks/build-api-guide/post.yaml - timeout: 1800 vars: - tox_envlist: api-guide + sphinx_build_dir: api-ref/build + sphinx_source_dir: api-ref/source # We only publish the master branch, so no need to run # for changes on other branches. branches: master files: - - ^tox.ini$ - ^api-guide/.* - bindep.txt - - other-requirements.txt + - doc/requirements.txt + - test-requirements.txt - job: name: build-openstack-deploy-guide - parent: openstack-tox + parent: build-openstack-sphinx-docs description: | Build deploy-guide document. - success-url: html/ - post-run: playbooks/build-deploy-guide/post.yaml - timeout: 1800 vars: - tox_envlist: deploy-guide + sphinx_build_dir: deploy-guide/build + sphinx_source_dir: deploy-guide/source files: - - ^tox.ini$ - ^deploy-guide/.* - bindep.txt - - other-requirements.txt + - doc/requirements.txt + - test-requirements.txt - job: name: build-openstack-install-guide - parent: openstack-tox + parent: build-openstack-sphinx-docs description: | Build install-guide document. - success-url: html/ - post-run: playbooks/build-install-guide/post.yaml - timeout: 1800 vars: - tox_envlist: install-guide + sphinx_build_dir: install-guide/build + sphinx_source_dir: install-guide/source # This job runs only pre-pike, with pike the documents have been # integrated into normal builds. branches: - stable/newton - stable/ocata files: - - ^tox.ini$ - ^install-guide/.* - bindep.txt - - other-requirements.txt + - doc/requirements.txt + - test-requirements.txt - job: name: build-placement-api-ref - parent: openstack-tox + parent: build-openstack-sphinx-docs description: | Build placement-api-ref document. This job runs only on master branch. - success-url: html/ - post-run: playbooks/build-placement-api-ref/post.yaml - timeout: 1800 # We only publish the master branch, so no need to run # for changes on other branches. branches: master vars: - tox_envlist: placement-api-ref + sphinx_build_dir: placement-api-ref/build + sphinx_source_dir: placement-api-ref/source files: - - ^tox.ini$ - ^placement-api-ref/.* - bindep.txt - - other-requirements.txt + - doc/requirements.txt + - test-requirements.txt - job: name: legacy-base