From a7ef39c2c0df2ca5cebc9cc51b019267d0b925c6 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 16 Aug 2017 10:00:19 -0700
Subject: [PATCH] Zuulv3: move the job dir under /var/lib/zuul

We want to ensure that our jobdir and the git repo cache are
on the same filesystem.  Configure the executors to use a dir
under /var/lib/zuul for the jobdir.  We will mount a new (large)
filesystem at /var/lib/zuul to accomodate both.

Change-Id: I91472fa609274aadcf4945aad44f25014c07b105
---
 manifests/init.pp         | 7 +++++++
 templates/zuulv3.conf.erb | 1 +
 2 files changed, 8 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index a2989cf..644d260 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -323,6 +323,13 @@ class zuul (
     group  => 'zuul',
   }
 
+  file { '/var/lib/zuul/builds':
+    ensure  => directory,
+    owner   => 'zuul',
+    group   => 'zuul',
+    require => File['/var/lib/zuul'],
+  }
+
   file { '/var/lib/zuul/git':
     ensure  => directory,
     owner   => 'zuul',
diff --git a/templates/zuulv3.conf.erb b/templates/zuulv3.conf.erb
index df69eaf..e8ef32b 100644
--- a/templates/zuulv3.conf.erb
+++ b/templates/zuulv3.conf.erb
@@ -48,6 +48,7 @@ git_user_name=<%= @git_name %>
 
 [executor]
 log_config=/etc/zuul/executor-logging.conf
+job_dir=/var/lib/zuul/builds
 <% if @site_variables_yaml_file != nil -%>
 variables=/etc/zuul/site-variables.yaml
 <% end -%>