Ema has uploaded a new change for review. https://gerrit.wikimedia.org/r/276493
Change subject: Do not include dynamic directors in VCL test files ...................................................................... Do not include dynamic directors in VCL test files The backend names defined in /etc/varnish/directors.{backend,frontend}.vcl are instance-dependent. Since our VTC test cases need to override backend definitions, do not include dynamic directors in VCL test files. Change-Id: I72e33864ffc2b1887e1ffa0a8d12217d625e3c81 --- M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/276493/1 diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb index 6d32ba0..f01b6d5 100644 --- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb +++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb @@ -134,7 +134,7 @@ <% end # director loop -%> <% -if @use_dynamic_directors and @dynamic_directors -%> +if @use_dynamic_directors and @dynamic_directors and not @varnish_testing -%> include "directors.<%= @inst %>.vcl"; <% end -%> -- To view, visit https://gerrit.wikimedia.org/r/276493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72e33864ffc2b1887e1ffa0a8d12217d625e3c81 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits