QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82231
Change subject: Specify push configurations for gerrit's replication in lists
......................................................................
Specify push configurations for gerrit's replication in lists
The multiline push statements got rendered to
push = push = +refs/tags/*:refs/tags/*
push = +refs/heads/*:refs/heads/*
in replication.config. While refs/heads/* did get replicated,
refs/tags/* did not. We now specify the different push configurations
in lists; similar to the urls for 'jenkins-salves'.
Bug: 53597
Change-Id: I26715cc8972be1fff6c0c7e77270ac9f265eaa79
---
M manifests/role/gerrit.pp
1 file changed, 12 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/82231/1
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index c805d28..c2d736a 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -16,6 +16,11 @@
class production::old {
system_role { 'role::gerrit::production': description => 'Old
gerrit master' }
+ $replication_basic_push_refs = [
+ '+refs/heads/*:refs/heads/*',
+ '+refs/tags/*:refs/tags/*',
+ ]
+
class { "gerrit::instance":
db_host => 'db1048.eqiad.wmnet',
host => 'gerrit.wikimedia.org',
@@ -59,8 +64,7 @@
'url' =>
'g...@github.com:wikimedia/${name}',
'threads' => '4',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
},
@@ -68,8 +72,7 @@
'url' =>
'g...@github.com:wikimedia/puppet-cdh4',
'threads' => '1',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
'projects' =>
'operations/puppet/cdh4',
@@ -78,8 +81,7 @@
'url' =>
'g...@github.com:wikimedia/puppet-jmxtrans',
'threads' => '1',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
'projects' =>
'operations/puppet/jmxtrans',
@@ -88,8 +90,7 @@
'url' =>
'g...@github.com:wikimedia/puppet-zookeeper',
'threads' => '1',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
'projects' =>
'operations/puppet/zookeeper',
@@ -98,8 +99,7 @@
'url' =>
'g...@github.com:wikimedia/kraken',
'threads' => '1',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
'projects' =>
'analytics/kraken',
@@ -109,8 +109,7 @@
'url' =>
'g...@github.com:wikimedia/puppet-kafka',
'threads' => '1',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
'projects' =>
'operations/puppet/kafka',
@@ -120,8 +119,7 @@
'url' =>
'g...@github.com:wikimedia/varnishkafka',
'threads' => '1',
'authGroup' =>
'mediawiki-replication',
- 'push' =>
'+refs/heads/*:refs/heads/*
- push = +refs/tags/*:refs/tags/*',
+ 'push' =>
$replication_basic_push_refs,
'remoteNameStyle' => 'dash',
'mirror' => 'true',
'projects' =>
'operations/software/varnish/varnishkafka',
--
To view, visit https://gerrit.wikimedia.org/r/82231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26715cc8972be1fff6c0c7e77270ac9f265eaa79
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <christ...@quelltextlich.at>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
