openstack/openstack-zuul-jobs
Code Issues Proposed changes

Merge "Handle tags in infra docs publishing"

Browse Source
This commit is contained in:
Zuul 2018-02-14 18:59:06 +00:00 committed by Gerrit Code Review
commit a5aa747b3d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
roles/prepare-infra-docs-for-afs/tasks/main.yaml
View File

@ -2,19 +2,26 @@
set_fact:
doc_build_dir: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}"
- name: Write marker text
- name: Write branch marker text
copy:
dest: "{{ doc_build_dir }}/html/.root-marker"
content: "Project: {{ zuul.project.name }} Branch: {{ zuul.branch }} Build: {{ zuul.build }} Revision: {{ zuul.ref }}"
when: "zuul.branch is defined"
- name: Write tag marker text
copy:
dest: "{{ doc_build_dir }}/html/.root-marker"
content: "Project: {{ zuul.project.name }} Tag: {{ zuul.tag }} Build: {{ zuul.build }} Revision: {{ zuul.ref }}"
when: "zuul.tag is defined"
- name: Process tagged build
include: tagged.yaml
when: "zuul.branch != 'master' and zuul.tag is defined"
when: "zuul.tag is defined"
- name: Process stable branch build
include: stable.yaml
when: "'stable' in zuul.branch and zuul.tag is not defined"
when: "zuul.branch is defined and 'stable' in zuul.branch and zuul.tag is not defined"
- name: Process branch build
include: branch.yaml
when: "zuul.branch != 'master' and 'stable' not in zuul.branch and zuul.tag is not defined"
when: "zuul.branch is defined and zuul.branch != 'master' and 'stable' not in zuul.branch and zuul.tag is not defined"

2
roles/prepare-infra-docs-for-afs/tasks/tagged.yaml
View File

@ -14,5 +14,5 @@
path: "{{ doc_build_dir }}/html/{{ zuul.tag | dirname }}"
state: directory
- name: Move html to branch location
- name: Move html to tag location
command: "mv {{ doc_build_dir }}/tmp {{ doc_build_dir }}/html/{{ zuul.tag }}"