Dzahn has submitted this change and it was merged.
Change subject: zuul: migrate server only settings out of merger
......................................................................
zuul: migrate server only settings out of merger
The url_pattern and status_url settings are solely for the Zuul server.
Stop populating them for both merger and server.
Change-Id: I97c1c702be1f44bcdc647517567cb6169d3100f4
---
M hieradata/common/zuul.yaml
M hieradata/role/common/zuul/server.yaml
M modules/role/manifests/zuul/merger.pp
M modules/role/manifests/zuul/server.pp
M modules/zuul/manifests/merger.pp
M modules/zuul/templates/zuul.conf.erb
6 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/zuul.yaml b/hieradata/common/zuul.yaml
index 4a31991..5fbad1f 100644
--- a/hieradata/common/zuul.yaml
+++ b/hieradata/common/zuul.yaml
@@ -1,5 +1,3 @@
zuul::common:
gerrit_server: gerrit.wikimedia.org
gerrit_user: jenkins-bot
- url_pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console'
- status_url: 'https://integration.wikimedia.org/zuul/'
diff --git a/hieradata/role/common/zuul/server.yaml
b/hieradata/role/common/zuul/server.yaml
index 51128dd..c21168f 100644
--- a/hieradata/role/common/zuul/server.yaml
+++ b/hieradata/role/common/zuul/server.yaml
@@ -7,3 +7,5 @@
jenkins_user: zuul-bot
# FIXME use a lookup?
statsd_host: statsd.eqiad.wmnet
+ url_pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console'
+ status_url: 'https://integration.wikimedia.org/zuul/'
diff --git a/modules/role/manifests/zuul/merger.pp
b/modules/role/manifests/zuul/merger.pp
index b6dbb77..38f48f5 100644
--- a/modules/role/manifests/zuul/merger.pp
+++ b/modules/role/manifests/zuul/merger.pp
@@ -9,8 +9,6 @@
# Shared settings
gerrit_server => $conf_common['gerrit_server'],
gerrit_user => $conf_common['gerrit_user'],
- url_pattern => $conf_common['url_pattern'],
- status_url => $conf_common['status_url'],
# Merger related
gearman_server => $conf_merger['gearman_server'],
diff --git a/modules/role/manifests/zuul/server.pp
b/modules/role/manifests/zuul/server.pp
index 1803d56..80de5a8 100644
--- a/modules/role/manifests/zuul/server.pp
+++ b/modules/role/manifests/zuul/server.pp
@@ -14,8 +14,6 @@
# Shared settings
gerrit_server => $conf_common['gerrit_server'],
gerrit_user => $conf_common['gerrit_user'],
- url_pattern => $conf_common['url_pattern'],
- status_url => $conf_common['status_url'],
# Server settings
jenkins_apikey => $jenkins_apikey,
@@ -23,6 +21,8 @@
gearman_server_start => $conf_server['gearman_server_start'],
jenkins_server => $conf_server['jenkins_server'],
jenkins_user => $conf_server['jenkins_user'],
+ url_pattern => $conf_server['url_pattern'],
+ status_url => $conf_server['status_url'],
statsd_host => $conf_server['statsd_host'],
}
diff --git a/modules/zuul/manifests/merger.pp b/modules/zuul/manifests/merger.pp
index 3b56c19..f418614 100644
--- a/modules/zuul/manifests/merger.pp
+++ b/modules/zuul/manifests/merger.pp
@@ -19,13 +19,11 @@
$gearman_server,
$gerrit_server,
$gerrit_user,
- $url_pattern,
$gerrit_ssh_key_file,
$gerrit_baseurl = 'https://gerrit.wikimedia.org/r',
$git_dir = '/var/lib/zuul/git',
$git_email = "zuul-merger@${::hostname}",
$git_name = 'Wikimedia Zuul Merger',
- $status_url = "https://${::fqdn}/zuul/status";,
$zuul_url = $::fqdn,
) {
diff --git a/modules/zuul/templates/zuul.conf.erb
b/modules/zuul/templates/zuul.conf.erb
index 60396b5..8b520e0 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -33,9 +33,11 @@
layout_config=/etc/zuul/wikimedia/zuul/layout.yaml
log_config=/etc/zuul/logging.conf
state_dir=/var/lib/zuul
+<% if @zuul_role == 'server' -%>
url_pattern=<%= @url_pattern %>
status_url=<%= @status_url %>
job_name_in_report = true
+<% end -%>
<% if @zuul_role == 'merger' -%>
[merger]
--
To view, visit https://gerrit.wikimedia.org/r/309299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97c1c702be1f44bcdc647517567cb6169d3100f4
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
