From d20346fed1f35de628a93f922688919eb9cfaef7 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 2 Apr 2019 09:23:26 -0700 Subject: [PATCH] Set a default for docs path templates Even though the playbook for a promote job doesn't use the afs.docs_tag_path variable, since it uses afs.docs_master_path Ansible apparently tries to expand all the keys under afs, so they all need to evaluate. Supply a default for the zuul.tag component so that happens, but set the default to "_error" so if the variable is accidentally used in the wrong place, we don't overwrite the branch tip docs. Change-Id: I00f8bcde11a2a5c1f12420035be3464af0856122 --- zuul.d/secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml index 45fd7cb..a4a2772 100644 --- a/zuul.d/secrets.yaml +++ b/zuul.d/secrets.yaml @@ -14,4 +14,4 @@ M65OaTRiJQQV1TvCQHmmfDM/FJxfCmjH5lI7zxeW0mBmUOqdNWPxQm6OidkSXk= service_name: service/zuul-website@OPENSTACK.ORG docs_master_path: "/afs/.openstack.org/project/zuul-ci.org/www/docs/{{ zuul.project.short_name }}" - docs_tag_path: "/afs/.openstack.org/project/zuul-ci.org/www/docs/{{ zuul.project.short_name }}/{{ zuul.tag }}" + docs_tag_path: "/afs/.openstack.org/project/zuul-ci.org/www/docs/{{ zuul.project.short_name }}/{{ zuul.tag | default('_error') }}"