From 6e561b71984ab2e4217ed33f98ef1dc3d5817d99 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 31 May 2016 14:31:45 -0700 Subject: [PATCH] Have zuul use the copied jenkins jobs directory We have puppet copy the contents of the jenkins_jobs directory in the project-config repo to a new directory in /etc, principally so that puppet can detect when files in that directory have changed (as opposed to when anything in the repo changes) and perform a reload. Tell zuul to use those copied files. This avoids a race where the vcsrepo may update after the file copy, which would delay the zuul update by a puppet-ansible pulse. Change-Id: I4dfd74c7d72dcf9a920c55143d56329ada7186ab --- modules/openstack_project/manifests/zuul_launcher.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/zuul_launcher.pp b/modules/openstack_project/manifests/zuul_launcher.pp index 5fc3d980f3..f863e18401 100644 --- a/modules/openstack_project/manifests/zuul_launcher.pp +++ b/modules/openstack_project/manifests/zuul_launcher.pp @@ -67,7 +67,7 @@ class openstack_project::zuul_launcher( git_name => $git_name, revision => $revision, git_source_repo => $git_source_repo, - jenkins_jobs => $::project_config::jenkins_job_builder_config_dir, + jenkins_jobs => '/etc/jenkins_jobs/config', workspace_root => $workspace_root, worker_private_key_file => $worker_private_key_file, worker_username => $worker_username,