summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2018-04-16 15:54:24 -0700
committerJames E. Blair <jeblair@redhat.com>2018-04-17 07:50:24 -0700
commit66643f2e050324ed9b4c9ca372f49fc9b96132de (patch)
treec0f616c7800ac5e317cebe312be49c1b00c4f669
parent498b185b23494c1deb9d785e853fdc7850f7e4a6 (diff)
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
Notes
Notes (review): Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 18 Apr 2018 20:18:52 +0000 Reviewed-on: https://review.openstack.org/561749 Project: openstack-infra/zuul-website Branch: refs/heads/master
-rw-r--r--.zuul.yaml7
-rw-r--r--roles/build-site/README.rst3
-rw-r--r--roles/build-site/tasks/main.yaml8
3 files changed, 14 insertions, 4 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index a1029df..ba15a66 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,6 +2,9 @@
2 name: zuul-website-build 2 name: zuul-website-build
3 description: | 3 description: |
4 Publishes a draft version of the Zuul website. 4 Publishes a draft version of the Zuul website.
5 required-projects:
6 - openstack-infra/zuul-website
7 - openstack-infra/zuul-website-media
5 success-url: html/ 8 success-url: html/
6 run: playbooks/build-site.yaml 9 run: playbooks/build-site.yaml
7 post-run: playbooks/publish-draft-site.yaml 10 post-run: playbooks/publish-draft-site.yaml
@@ -13,7 +16,9 @@
13 parent: publish-zuul-website 16 parent: publish-zuul-website
14 description: | 17 description: |
15 Publishes the Zuul website. 18 Publishes the Zuul website.
16 protected: True # Only run this job in this repo 19 required-projects:
20 - openstack-infra/zuul-website
21 - openstack-infra/zuul-website-media
17 run: playbooks/build-site.yaml 22 run: playbooks/build-site.yaml
18 post-run: playbooks/publish-site.yaml 23 post-run: playbooks/publish-site.yaml
19 nodeset: 24 nodeset:
diff --git a/roles/build-site/README.rst b/roles/build-site/README.rst
index b54d273..879a5bb 100644
--- a/roles/build-site/README.rst
+++ b/roles/build-site/README.rst
@@ -4,7 +4,8 @@ The Zuul website is currently static, however, if it later is built
4by a static site generator, or otherwise needs pre-processing, 4by a static site generator, or otherwise needs pre-processing,
5this role should perform that. 5this role should perform that.
6 6
7Right now, it just copies files. 7Right now, it just copies files from the zuul-website and
8zuul-website-media repos.
8 9
9**Role Variables** 10**Role Variables**
10 11
diff --git a/roles/build-site/tasks/main.yaml b/roles/build-site/tasks/main.yaml
index a3acaa0..1689f34 100644
--- a/roles/build-site/tasks/main.yaml
+++ b/roles/build-site/tasks/main.yaml
@@ -1,4 +1,8 @@
1- name: Copy site to output directory 1- name: Copy website to output directory
2 copy: 2 copy:
3 src: "{{ zuul_work_dir }}/www/" 3 src: "{{ zuul.executor.work_root }}/{{ zuul.projects['git.openstack.org/openstack-infra/zuul-website'].src_dir }}/www/"
4 dest: "{{ output_dir }}" 4 dest: "{{ output_dir }}"
5- name: Copy media to output directory
6 copy:
7 src: "{{ zuul.executor.work_root }}/{{ zuul.projects['git.openstack.org/openstack-infra/zuul-website-media'].src_dir }}/media/"
8 dest: "{{ output_dir }}/media"