Merge zuul-website-media when publishing site
The protected attribute is removed so these jobs can also be run in the zuul-website-media project. The parent job retains an allowed-project setting which accomplishes the same thing. Depends-On: https://review.openstack.org/561747 Change-Id: Ifc310307632d3388b5ff8bdedd7e8153406d69d6
This commit is contained in:
parent
498b185b23
commit
66643f2e05
@ -2,6 +2,9 @@
|
|||||||
name: zuul-website-build
|
name: zuul-website-build
|
||||||
description: |
|
description: |
|
||||||
Publishes a draft version of the Zuul website.
|
Publishes a draft version of the Zuul website.
|
||||||
|
required-projects:
|
||||||
|
- openstack-infra/zuul-website
|
||||||
|
- openstack-infra/zuul-website-media
|
||||||
success-url: html/
|
success-url: html/
|
||||||
run: playbooks/build-site.yaml
|
run: playbooks/build-site.yaml
|
||||||
post-run: playbooks/publish-draft-site.yaml
|
post-run: playbooks/publish-draft-site.yaml
|
||||||
@ -13,7 +16,9 @@
|
|||||||
parent: publish-zuul-website
|
parent: publish-zuul-website
|
||||||
description: |
|
description: |
|
||||||
Publishes the Zuul website.
|
Publishes the Zuul website.
|
||||||
protected: True # Only run this job in this repo
|
required-projects:
|
||||||
|
- openstack-infra/zuul-website
|
||||||
|
- openstack-infra/zuul-website-media
|
||||||
run: playbooks/build-site.yaml
|
run: playbooks/build-site.yaml
|
||||||
post-run: playbooks/publish-site.yaml
|
post-run: playbooks/publish-site.yaml
|
||||||
nodeset:
|
nodeset:
|
||||||
|
@ -4,7 +4,8 @@ The Zuul website is currently static, however, if it later is built
|
|||||||
by a static site generator, or otherwise needs pre-processing,
|
by a static site generator, or otherwise needs pre-processing,
|
||||||
this role should perform that.
|
this role should perform that.
|
||||||
|
|
||||||
Right now, it just copies files.
|
Right now, it just copies files from the zuul-website and
|
||||||
|
zuul-website-media repos.
|
||||||
|
|
||||||
**Role Variables**
|
**Role Variables**
|
||||||
|
|
||||||
|
@ -1,4 +1,8 @@
|
|||||||
- name: Copy site to output directory
|
- name: Copy website to output directory
|
||||||
copy:
|
copy:
|
||||||
src: "{{ zuul_work_dir }}/www/"
|
src: "{{ zuul.executor.work_root }}/{{ zuul.projects['git.openstack.org/openstack-infra/zuul-website'].src_dir }}/www/"
|
||||||
dest: "{{ output_dir }}"
|
dest: "{{ output_dir }}"
|
||||||
|
- name: Copy media to output directory
|
||||||
|
copy:
|
||||||
|
src: "{{ zuul.executor.work_root }}/{{ zuul.projects['git.openstack.org/openstack-infra/zuul-website-media'].src_dir }}/media/"
|
||||||
|
dest: "{{ output_dir }}/media"
|
||||||
|
Loading…
Reference in New Issue
Block a user