Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397601 )
Change subject: contint: remove browsertests role from permanent slaves
......................................................................
contint: remove browsertests role from permanent slaves
role::ci::slave::browsertests is already applied on the selenium*
instances. It is not needed on the generic slaves since we migrated all
jobs.
That also caused:
contint: Remove duplicate Class[Contint::Packages::Ruby]
Duplicate declaration: Class[Contint::Packages::Ruby] is already declared;
cannot redeclare at /etc/puppet/modules/profile/manifests/ci/browsertests.pp:5
at /etc/puppet/modules/profile/manifests/ci/browsertests.pp:5:5
Bug: T182642
Change-Id: I9ef594346ea338cf68ee1d114ba4ee5123d5e371
---
M modules/role/manifests/ci/slave/labs.pp
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/ci/slave/labs.pp
b/modules/role/manifests/ci/slave/labs.pp
index 9ab3d5f..35b20e5 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -39,13 +39,6 @@
include profile::ci::browsers
- class { 'role::ci::slave::browsertests':
- require => [
- Class['role::ci::slave::labs::common'], # /srv
- Class['contint::packages::labs'], # realize common packages first
- ]
- }
-
# The sshkey resource seems to modify file permissions and make it
# unreadable - this is a known bug
(https://tickets.puppetlabs.com/browse/PUP-2900)
# Trying to define this file resource, and notify the resource to be
ensured
--
To view, visit https://gerrit.wikimedia.org/r/397601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ef594346ea338cf68ee1d114ba4ee5123d5e371
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <[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
