Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252656
Change subject: Drop role::zuul::production
......................................................................
Drop role::zuul::production
The class was transitional and solely includes:
role::zuul::merger
role::zuul::server
Since it is bad practice to have a role include other roles, include the
role directly on the sole nodes using role::zuul::production: gallium.
On gallium, Split each role on its own line.
Update a comment hint on ytterbium.
Change-Id: Ic29d7c91a6250c81a38377b229997c71f3d7f980
---
M manifests/role/zuul.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/252656/1
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 18d41d6..601d183 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -150,21 +150,3 @@
}
} # /role::zuul::merger
-
-# Class: role::zuul::production
-#
-# Install the continuous integration Zuul instance for production usage.
-#
-# https://www.mediawiki.org/wiki/Continuous_integration/Zuul
-#
-# The Zuul git repositories are published over the git:// protocol by using git
-# daemon. That allows remote Jenkins slaves to fetch the references crafted by
-# Zuul when a change is submitted.
-#
-class role::zuul::production {
- system::role { 'role::zuul::production (obsolete)': description => 'Zuul
on production' }
-
- include role::zuul::merger
- include role::zuul::server
-
-} # /role::zuul::production
diff --git a/manifests/site.pp b/manifests/site.pp
index d652bfb..767a451 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -993,7 +993,11 @@
# Continuous Integration
node 'gallium.wikimedia.org' {
- role ci::master, ci::slave, ci::website, zuul::production
+ role ci::master,
+ ci::slave,
+ ci::website,
+ zuul::merger,
+ zuul::server
# T51846, let us sync VisualEditor in mediawiki/extensions.git
sudo::user { 'jenkins-slave':
@@ -2492,7 +2496,7 @@
# https://www.mediawiki.org/wiki/Gerrit
node 'ytterbium.wikimedia.org' {
# Note: whenever moving Gerrit out of ytterbium, you will need
- # to update the role::zuul::production
+ # to update the role::zuul::configuration variable 'gerrit_server'
role gerrit::production
include standard
--
To view, visit https://gerrit.wikimedia.org/r/252656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic29d7c91a6250c81a38377b229997c71f3d7f980
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
