Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315962

Change subject: contint: drop role::ci::slave::localbrowser
......................................................................

contint: drop role::ci::slave::localbrowser

The only thing that class does is really "include contint::browser". The
sole caller is role::cis::slave::labs which already includes everything
else.

Drop the useless role::ci::slave::localbrowser and directly include
contint::browser in parent role.

Change-Id: I53bc2350134e58f2e9ca12b7775ff3ab9d160389
---
M modules/role/manifests/ci/slave/labs.pp
D modules/role/manifests/ci/slave/localbrowser.pp
2 files changed, 1 insertion(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/315962/1

diff --git a/modules/role/manifests/ci/slave/labs.pp 
b/modules/role/manifests/ci/slave/labs.pp
index 71c85c5..13d15d9 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -42,7 +42,7 @@
     class { '::zuul': }
 
     if os_version('ubuntu >= trusty || debian >= jessie') {
-        include role::ci::slave::localbrowser
+        include contint::browsers
 
         class { 'role::ci::slave::browsertests':
             require => [
diff --git a/modules/role/manifests/ci/slave/localbrowser.pp 
b/modules/role/manifests/ci/slave/localbrowser.pp
deleted file mode 100644
index 77ca5ef..0000000
--- a/modules/role/manifests/ci/slave/localbrowser.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class role::ci::slave::localbrowser {
-    requires_realm('labs')
-
-    system::role { 'role::ci::slave::localbrowser':
-        description => 'CI Jenkins slave for running tests in local browsers',
-    }
-
-    include role::ci::slave::labs::common
-    include contint::browsers
-
-    class { '::zuul': }
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/315962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53bc2350134e58f2e9ca12b7775ff3ab9d160389
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to