opendev/system-config
Code Issues Proposed changes

Add url_pattern to zuul.conf.

Browse Source 
Change-Id: Ib1d05a42e98613e746cbd7865cd97ce25f6a26c0
Reviewed-on: https://review.openstack.org/11940
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>
This commit is contained in:
James E. Blair 2012-08-24 10:44:27 -07:00 committed by James E. Blair
parent 0c6f4af977
commit a2c8473fe4
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -38,6 +38,7 @@ node "jenkins.openstack.org" {
jenkins_apikey => hiera('zuul_jenkins_apikey'), jenkins_apikey => hiera('zuul_jenkins_apikey'),
gerrit_server => 'review.openstack.org', gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins', gerrit_user => 'jenkins',
url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}'
} }
} }

4
modules/openstack_project/manifests/zuul.pp
View File

@ -3,7 +3,8 @@ class openstack_project::zuul(
$jenkins_user, $jenkins_user,
$jenkins_apikey, $jenkins_apikey,
$gerrit_server, $gerrit_server,
$gerrit_user $gerrit_user,
$url_pattern
) { ) {
class { "::zuul": class { "::zuul":
@ -12,6 +13,7 @@ class openstack_project::zuul(
jenkins_apikey => $jenkins_apikey, jenkins_apikey => $jenkins_apikey,
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
url_pattern => $url_pattern
} }
file { "/etc/zuul/layout.yaml": file { "/etc/zuul/layout.yaml":

3
modules/zuul/manifests/init.pp
View File

@ -3,7 +3,8 @@ class zuul (
$jenkins_user, $jenkins_user,
$jenkins_apikey, $jenkins_apikey,
$gerrit_server, $gerrit_server,
$gerrit_user $gerrit_user,
$url_pattern
) { ) {
$packages = ["python-webob", $packages = ["python-webob",
"python-daemon", "python-daemon",

1
modules/zuul/templates/zuul.conf.erb
View File

@ -14,3 +14,4 @@ log_config=/etc/zuul/logging.conf
state_dir=/var/lib/zuul state_dir=/var/lib/zuul
git_dir=/var/lib/zuul/git git_dir=/var/lib/zuul/git
push_change_refs=true push_change_refs=true
url_pattern=<%= url_pattern %>