opendev/base-jobs
Code Issues Proposed changes

Make docs secret template expansion safe

Browse Source 
Ansible will try to expand all of these variables if any is used,
even if some of them aren't used.  Therefore, make sure that
we have values in the jinja templates for zuul.branch or zuul.tag.

Also, correct the redirect content to avoid a loop.

Change-Id: I426c99b66ff00b709f249cb78bfc6c3d200f73cd
This commit is contained in:
James E. Blair 2019-04-02 10:35:35 -07:00
parent 393353a381
commit b5ee39ce08
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul.yaml
View File

@ -88,10 +88,10 @@
EuJvheVCAYjlq4lwshfNIysNA8WePvAze9T5DpVl1MayR7b1KC+R/7wM6xUCbw=
service_name: service/opendev-zuul@OPENSTACK.ORG
docs_master_path: "/afs/.openstack.org/project/opendev.org/docs/{{ zuul.project.name }}/latest"
docs_branch_path: "/afs/.openstack.org/project/opendev.org/docs/{{ zuul.project.name }}/{{ zuul.branch }}"
docs_tag_path: "/afs/.openstack.org/project/opendev.org/docs/{{ zuul.project.name }}/{{ zuul.tag }}"
docs_branch_path: "/afs/.openstack.org/project/opendev.org/docs/{{ zuul.project.name }}/{{ zuul.branch | default('_error') }}"
docs_tag_path: "/afs/.openstack.org/project/opendev.org/docs/{{ zuul.project.name }}/{{ zuul.tag | default('_error') }}"
docs_redirect_path: "/afs/.openstack.org/project/opendev.org/docs/{{ zuul.project.name }}/.htaccess"
docs_redirect_content: "Redirect 302 /{{ zuul.project.name }} /{{ zuul.project.name }}/latest"
docs_redirect_content: "RedirectMatch 302 ^/{{ zuul.project.name }}/?$ /{{ zuul.project.name }}/latest/"
- secret:
name: opendev-pypi