Andrew Bogott has submitted this change and it was merged.
Change subject: contint: stop gerrit replication to gallium
......................................................................
contint: stop gerrit replication to gallium
We only have a few jobs still running on gallium and none of them rely
on the Gerrit replication.
References to /srv/ssd/gerrit have been removed from Jenkins jobs and
slave scripts. Hence it is no more of any use.
Remove replicationdest from role::ci::slave (that is on gallium) and
from role::zuul::merger (only used on gallium).
Remove the Gerrit replication destination. Once applied, that will
need a reload of the replication plugin.
Bug: T86661
Change-Id: Ic3010a141946c84a61b8214a81f6601e273bc7e5
---
M manifests/role/ci.pp
M manifests/role/gerrit.pp
M manifests/role/zuul.pp
3 files changed, 0 insertions(+), 30 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 4f0a2b7..3b7bc22 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -124,14 +124,11 @@
}
# Set up a Jenkins slave suitable for Continuous Integration jobs execution.
-# You will need to setup the Gerrit replication on the Gerrit server by
-# amending the role::gerrit::production class
class role::ci::slave {
system::role { 'role::ci::slave': description => 'CI slave runner' }
include contint::packages
- include role::gerrit::production::replicationdest
include role::zuul::install
package {
@@ -179,14 +176,6 @@
nrpe::monitor_service { 'ci_tmpfs':
description => 'CI tmpfs disk space',
nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 20% -c 5% -e -p
/var/lib/jenkins-slave/tmpfs',
- }
-
- # Setup Gerrit replication destination:
- file { '/srv/ssd/gerrit':
- ensure => 'directory',
- owner => 'gerritslave',
- group => 'root',
- mode => '0755',
}
# user and private key for Travis integration
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index dcd3781..6adf953 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -56,20 +56,6 @@
replication => {
# If adding a new entry, remember to add the fingerprint to
gerrit2's known_hosts
- # All entries should have the same target directory
'/srv/ssd/gerrit'
- # since it is referenced in Jenkins jobs.
- 'jenkins-slaves' => {
- 'url' => [
- # Note: This is in single quotes on purpose. ${name}
is not
- # expected to be expanded by puppet but rather by
gerrit
- #
- # lint:ignore:single_quote_string_with_variables
-
'[email protected]:/srv/ssd/gerrit/${name}.git',
- # lint:endignore
- ],
- 'threads' => '4',
- 'mirror' => true,
- },
'gitblit' => {
# Note: This is in single quotes on purpose. ${name} is not
# expected to be expanded by puppet but rather by gerrit
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 601d183..5031bf0 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -120,11 +120,6 @@
class role::zuul::merger {
system::role { 'role::zuul::merger': description => 'Zuul merger' }
- if $::realm == 'production' {
- # We will receive replication of git bare repositories from Gerrit
- include role::gerrit::production::replicationdest
- }
-
include role::zuul::configuration
include role::zuul::install
include ::zuul::monitoring::merger
--
To view, visit https://gerrit.wikimedia.org/r/244498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3010a141946c84a61b8214a81f6601e273bc7e5
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
