Use playbooks/publish/openstack-afs everywhere
We duplicate the afs upload in many playbooks, use instead the now parameterized playbooks/publish/openstack-afs playbook. Change-Id: I3c6b9b5eb82a2628411571299eaedbf11f0e5d56
This commit is contained in:
parent
b5ffcb623c
commit
c93a1b21a2
@ -6,13 +6,3 @@
|
|||||||
sphinx_output_suffix: "/"
|
sphinx_output_suffix: "/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/contributors"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -8,13 +8,3 @@
|
|||||||
sphinx_output_suffix: "/"
|
sphinx_output_suffix: "/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/project-deploy-guide/{{ zuul.project.short_name }}"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/infra/{{ zuul.project.short_name }}"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
@ -8,13 +8,3 @@
|
|||||||
sphinx_output_src: "src/{{ zuul.project.canonical_name }}/docs-site/output/"
|
sphinx_output_src: "src/{{ zuul.project.canonical_name }}/docs-site/output/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/infra"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/infra/manual"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
@ -5,13 +5,3 @@
|
|||||||
sphinx_output_src: "{{ zuul.project.src_dir }}/publish-docs/"
|
sphinx_output_src: "{{ zuul.project.src_dir }}/publish-docs/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -6,13 +6,3 @@
|
|||||||
sphinx_output_suffix: "/"
|
sphinx_output_suffix: "/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/api-ref/placement"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -8,13 +8,3 @@
|
|||||||
sphinx_output_src: "{{ zuul.project.src_dir }}/output/"
|
sphinx_output_src: "{{ zuul.project.src_dir }}/output/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/infra/publications/"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -4,13 +4,3 @@
|
|||||||
sphinx_output_src: "{{ zuul.project.src_dir }}/_out/"
|
sphinx_output_src: "{{ zuul.project.src_dir }}/_out/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/infra/publications/"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -6,13 +6,3 @@
|
|||||||
sphinx_output_suffix: "/"
|
sphinx_output_suffix: "/"
|
||||||
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
|
||||||
when: zuul_success | bool
|
when: zuul_success | bool
|
||||||
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: create-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: upload-afs
|
|
||||||
afs_target: "{{ afs.path }}/releasenotes/{{ zuul.project.short_name }}"
|
|
||||||
when: zuul_success | bool
|
|
||||||
- role: destroy-afs-token
|
|
||||||
when: zuul_success | bool
|
|
||||||
|
@ -326,11 +326,15 @@
|
|||||||
final: true
|
final: true
|
||||||
pre-run: playbooks/sphinx/pre.yaml
|
pre-run: playbooks/sphinx/pre.yaml
|
||||||
run: playbooks/sphinx/run.yaml
|
run: playbooks/sphinx/run.yaml
|
||||||
post-run: playbooks/publish/contributor-guide-afs.yaml
|
post-run:
|
||||||
|
- playbooks/publish/contributor-guide-afs.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
branches: master
|
branches: master
|
||||||
|
vars:
|
||||||
|
afs_subpath: "/contributors"
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
name: afs
|
name: afs
|
||||||
@ -376,13 +380,16 @@
|
|||||||
final: true
|
final: true
|
||||||
pre-run: playbooks/releasenotes/pre.yaml
|
pre-run: playbooks/releasenotes/pre.yaml
|
||||||
run: playbooks/releasenotes/run.yaml
|
run: playbooks/releasenotes/run.yaml
|
||||||
post-run: playbooks/publish/releasenotes.yaml
|
post-run:
|
||||||
|
- playbooks/publish/releasenotes.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
override-branch: master
|
override-branch: master
|
||||||
required-projects:
|
required-projects:
|
||||||
- name: openstack/requirements
|
- name: openstack/requirements
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
vars:
|
vars:
|
||||||
|
afs_subpath: "/releasenotes/{{ zuul.project.short_name }}"
|
||||||
constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
|
constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
|
||||||
sphinx_build_dir: releasenotes/build
|
sphinx_build_dir: releasenotes/build
|
||||||
secrets:
|
secrets:
|
||||||
@ -436,10 +443,12 @@
|
|||||||
run: playbooks/sphinx/run.yaml
|
run: playbooks/sphinx/run.yaml
|
||||||
post-run:
|
post-run:
|
||||||
- playbooks/sphinx/post-infra.yaml
|
- playbooks/sphinx/post-infra.yaml
|
||||||
- playbooks/publish/infra-afs.yaml
|
- playbooks/publish/openstack-afs.yaml
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
|
vars:
|
||||||
|
afs_subpath: "/infra/{{ zuul.project.short_name }}"
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
name: afs
|
name: afs
|
||||||
@ -456,8 +465,9 @@
|
|||||||
run: playbooks/sphinx/run.yaml
|
run: playbooks/sphinx/run.yaml
|
||||||
post-run:
|
post-run:
|
||||||
- playbooks/sphinx/post-infra.yaml
|
- playbooks/sphinx/post-infra.yaml
|
||||||
- playbooks/publish/infra-afs.yaml
|
- playbooks/publish/openstack-afs.yaml
|
||||||
vars:
|
vars:
|
||||||
|
afs_subpath: "/infra/{{ zuul.project.short_name }}"
|
||||||
sphinx_python: python3
|
sphinx_python: python3
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
@ -475,12 +485,14 @@
|
|||||||
run: playbooks/sphinx/run.yaml
|
run: playbooks/sphinx/run.yaml
|
||||||
post-run:
|
post-run:
|
||||||
- playbooks/sphinx/post-infra.yaml
|
- playbooks/sphinx/post-infra.yaml
|
||||||
- playbooks/publish/infra-manual.yaml
|
- playbooks/publish/openstack-afs.yaml
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- openstack-infra/infra-manual
|
- openstack-infra/infra-manual
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
|
vars:
|
||||||
|
afs_subpath: "/infra/manual"
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
name: afs
|
name: afs
|
||||||
@ -511,7 +523,9 @@
|
|||||||
final: true
|
final: true
|
||||||
pre-run: playbooks/project-config/pre-tox.yaml
|
pre-run: playbooks/project-config/pre-tox.yaml
|
||||||
run: playbooks/project-config/run-tox.yaml
|
run: playbooks/project-config/run-tox.yaml
|
||||||
post-run: playbooks/publish/infra-index.yaml
|
post-run:
|
||||||
|
- playbooks/publish/infra-index.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- openstack-infra/project-config
|
- openstack-infra/project-config
|
||||||
roles:
|
roles:
|
||||||
@ -519,6 +533,7 @@
|
|||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: infra-docs
|
tox_envlist: infra-docs
|
||||||
|
afs_path: "/infra"
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
name: afs
|
name: afs
|
||||||
@ -529,13 +544,16 @@
|
|||||||
Publish the publication index
|
Publish the publication index
|
||||||
final: true
|
final: true
|
||||||
run: playbooks/publications-index/run.yaml
|
run: playbooks/publications-index/run.yaml
|
||||||
post-run: playbooks/publish/publications-index.yaml
|
post-run:
|
||||||
|
- playbooks/publish/publications-index.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- openstack-infra/publications
|
- openstack-infra/publications
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
vars:
|
vars:
|
||||||
|
afs_subpath: "/infra/publications/"
|
||||||
tox_envlist: infra-docs
|
tox_envlist: infra-docs
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
@ -547,13 +565,16 @@
|
|||||||
Publish one publication from openstack-infra/publications
|
Publish one publication from openstack-infra/publications
|
||||||
final: true
|
final: true
|
||||||
run: playbooks/publications/run.yaml
|
run: playbooks/publications/run.yaml
|
||||||
post-run: playbooks/publish/publications.yaml
|
post-run:
|
||||||
|
- playbooks/publish/publications.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- openstack-infra/publications
|
- openstack-infra/publications
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
vars:
|
vars:
|
||||||
|
afs_subpath: "/infra/publications/"
|
||||||
tox_envlist: infra-docs
|
tox_envlist: infra-docs
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
@ -716,11 +737,15 @@
|
|||||||
name: publish-openstack-manuals
|
name: publish-openstack-manuals
|
||||||
parent: publish-openstack-manuals-base
|
parent: publish-openstack-manuals-base
|
||||||
final: true
|
final: true
|
||||||
post-run: playbooks/publish/manuals.yaml
|
post-run:
|
||||||
|
- playbooks/publish/manuals.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- openstack/openstack-manuals
|
- openstack/openstack-manuals
|
||||||
- openstack/security-doc
|
- openstack/security-doc
|
||||||
- openstack/training-guides
|
- openstack/training-guides
|
||||||
|
vars:
|
||||||
|
afs_subpath: ""
|
||||||
secrets:
|
secrets:
|
||||||
- secret: afsdocs_secret
|
- secret: afsdocs_secret
|
||||||
name: afs
|
name: afs
|
||||||
@ -814,7 +839,9 @@
|
|||||||
- openstack/nova
|
- openstack/nova
|
||||||
pre-run: playbooks/sphinx/pre.yaml
|
pre-run: playbooks/sphinx/pre.yaml
|
||||||
run: playbooks/sphinx/run.yaml
|
run: playbooks/sphinx/run.yaml
|
||||||
post-run: playbooks/publish/placement-api-ref.yaml
|
post-run:
|
||||||
|
- playbooks/publish/placement-api-ref.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
@ -822,6 +849,7 @@
|
|||||||
# for changes on other branches.
|
# for changes on other branches.
|
||||||
branches: master
|
branches: master
|
||||||
vars:
|
vars:
|
||||||
|
afs_subpath: "/api-ref/placement"
|
||||||
sphinx_build_dir: placement-api-ref/build
|
sphinx_build_dir: placement-api-ref/build
|
||||||
sphinx_source_dir: placement-api-ref/source
|
sphinx_source_dir: placement-api-ref/source
|
||||||
secrets:
|
secrets:
|
||||||
@ -857,11 +885,14 @@
|
|||||||
https://docs.openstack.org/project-deploy-guide/
|
https://docs.openstack.org/project-deploy-guide/
|
||||||
pre-run: playbooks/sphinx/pre.yaml
|
pre-run: playbooks/sphinx/pre.yaml
|
||||||
run: playbooks/sphinx/run.yaml
|
run: playbooks/sphinx/run.yaml
|
||||||
post-run: playbooks/publish/deploy-guide.yaml
|
post-run:
|
||||||
|
- playbooks/publish/deploy-guide.yaml
|
||||||
|
- playbooks/publish/openstack-afs.yaml
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack-infra/zuul-jobs
|
- zuul: openstack-infra/zuul-jobs
|
||||||
- zuul: openstack-infra/openstack-zuul-jobs
|
- zuul: openstack-infra/openstack-zuul-jobs
|
||||||
vars:
|
vars:
|
||||||
|
afs_subpath: "/project-deploy-guide/{{ zuul.project.short_name }}"
|
||||||
sphinx_build_dir: deploy-guide/build
|
sphinx_build_dir: deploy-guide/build
|
||||||
sphinx_source_dir: deploy-guide/source
|
sphinx_source_dir: deploy-guide/source
|
||||||
secrets:
|
secrets:
|
||||||
|
Loading…
Reference in New Issue
Block a user