Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392976 )
Change subject: Move contint::browsers to a profile
......................................................................
Move contint::browsers to a profile
Two resolved violations:
modules/contint/manifests/browsers.pp:33
class 'contint::browsers' declares class xvfb from another module
modules/role/manifests/ci/slave/labs.pp:41
role 'role::ci::slave::labs' includes contint::browsers which is neither
a role nor a profile
Change-Id: I7c1f9a63631ba3cb81307c404adb042f2a7a7df6
---
R modules/profile/manifests/ci/browsers.pp
M modules/profile/manifests/ci/browsertests.pp
M modules/role/manifests/ci/slave/labs.pp
3 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/browsers.pp
b/modules/profile/manifests/ci/browsers.pp
similarity index 95%
rename from modules/contint/manifests/browsers.pp
rename to modules/profile/manifests/ci/browsers.pp
index 4accacf..1c92f79 100644
--- a/modules/contint/manifests/browsers.pp
+++ b/modules/profile/manifests/ci/browsers.pp
@@ -1,4 +1,4 @@
-class contint::browsers {
+class profile::ci::browsers {
package { [
# Without xfonts-cyrillic Xvdb emits warning:
diff --git a/modules/profile/manifests/ci/browsertests.pp
b/modules/profile/manifests/ci/browsertests.pp
index 8d08e69..f83c35b 100644
--- a/modules/profile/manifests/ci/browsertests.pp
+++ b/modules/profile/manifests/ci/browsertests.pp
@@ -6,8 +6,7 @@
}
# Provides phantomjs, firefox and xvfb
- class { '::contint::browsers':
- }
+ require profile::ci::browsers
# For Selenium jobs recording (T113520)
package { 'libav-tools':
diff --git a/modules/role/manifests/ci/slave/labs.pp
b/modules/role/manifests/ci/slave/labs.pp
index e4f8318..9ab3d5f 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -37,8 +37,7 @@
include role::ci::slave::labs::common
-
- include contint::browsers
+ include profile::ci::browsers
class { 'role::ci::slave::browsertests':
require => [
--
To view, visit https://gerrit.wikimedia.org/r/392976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c1f9a63631ba3cb81307c404adb042f2a7a7df6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
