Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193084
Change subject: ci: Move jenkins access granting code into a role
......................................................................
ci: Move jenkins access granting code into a role
Same code was present in all *oid roles
Change-Id: I23d9eb476dc43ca75c11bae87219bab481411975
---
M manifests/role/ci.pp
M manifests/role/citoid.pp
M manifests/role/cxserver.pp
M manifests/role/mathoid.pp
4 files changed, 15 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/193084/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 65c168a..f53abde 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -517,3 +517,18 @@
zuul_git_dir => $role::zuul::configuration::zuul_git_dir,
}
}
+
+# Grants genkins access to instances this is applied on
+# Also turns them into a jenkins slave
+# Used mostly for *oids atm.
+class role::ci::jenkins_access {
+ # Allow ssh access from the Jenkins master to the server where citoid is
+ # running
+ include contint::firewall::labs
+
+ # Instance got to be a Jenkins slave so we can update citoid whenever a
+ # change is made on mediawiki/services/citoid repository
+ include role::ci::slave::labs::common
+ # Also need the slave scripts for multi-git.sh
+ include contint::slave-scripts
+}
diff --git a/manifests/role/citoid.pp b/manifests/role/citoid.pp
index 2ce46c8..640fd48 100644
--- a/manifests/role/citoid.pp
+++ b/manifests/role/citoid.pp
@@ -14,15 +14,3 @@
port => '1970',
}
}
-
-class role::citoid::jenkins_access {
- # Allow ssh access from the Jenkins master to the server where citoid is
- # running
- include contint::firewall::labs
-
- # Instance got to be a Jenkins slave so we can update citoid whenever a
- # change is made on mediawiki/services/citoid repository
- include role::ci::slave::labs::common
- # Also need the slave scripts for multi-git.sh
- include contint::slave-scripts
-}
diff --git a/manifests/role/cxserver.pp b/manifests/role/cxserver.pp
index 1084ebc..a8822cd 100644
--- a/manifests/role/cxserver.pp
+++ b/manifests/role/cxserver.pp
@@ -22,15 +22,3 @@
check_command => "check_http_on_port!${::cxserver::port}",
}
}
-
-class role::cxserver::jenkins_access {
- # Allow ssh access from the Jenkins master to the server where cxserver is
- # running
- include contint::firewall::labs
-
- # Instance got to be a Jenkins slave so we can update cxserver whenever a
- # change is made on mediawiki/services/cxserver (NL: /deploy???) repository
- include role::ci::slave::labs::common
- # Also need the slave scripts for multi-git.sh
- include contint::slave-scripts
-}
diff --git a/manifests/role/mathoid.pp b/manifests/role/mathoid.pp
index 27d42ac..54b2087 100644
--- a/manifests/role/mathoid.pp
+++ b/manifests/role/mathoid.pp
@@ -40,15 +40,3 @@
check_command => 'check_http_on_port!10042',
}
}
-
-class role::mathoid::jenkins_access {
- # Allow ssh access from the Jenkins master to the server where mathoid is
- # running
- include contint::firewall::labs
-
- # Instance got to be a Jenkins slave so we can update mathoid whenever a
- # change is made on mediawiki/services/mathoid repository
- include role::ci::slave::labs::common
- # Also need the slave scripts for multi-git.sh
- include contint::slave-scripts
-}
--
To view, visit https://gerrit.wikimedia.org/r/193084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23d9eb476dc43ca75c11bae87219bab481411975
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
