Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392956 )
Change subject: Move contint::browsertests to a profile
......................................................................
Move contint::browsertests to a profile
One resolved violation:
modules/role/manifests/ci/slave/browsertests.pp:13
role 'role::ci::slave::browsertests' includes contint::browsertests
which is neither a role nor a profile
Change-Id: Ib1cfa0a174fc8ef4d0f75bcb35b7461d6351b6e4
---
D modules/contint/manifests/browsertests.pp
A modules/profile/manifests/ci/browsertests.pp
M modules/role/manifests/ci/slave/browsertests.pp
3 files changed, 18 insertions(+), 16 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
deleted file mode 100644
index 8cdc452..0000000
--- a/modules/contint/manifests/browsertests.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# == Class contint::browsertests
-#
-class contint::browsertests {
-
- include ::contint::packages::ruby
-
- # Provides phantomjs, firefox and xvfb
- include ::contint::browsers
-
- # For Selenium jobs recording (T113520)
- package { 'libav-tools':
- ensure => present,
- }
-
-}
diff --git a/modules/profile/manifests/ci/browsertests.pp
b/modules/profile/manifests/ci/browsertests.pp
new file mode 100644
index 0000000..8d08e69
--- /dev/null
+++ b/modules/profile/manifests/ci/browsertests.pp
@@ -0,0 +1,17 @@
+# == Class profile::ci::browsertests
+#
+class profile::ci::browsertests {
+
+ class { '::contint::packages::ruby':
+ }
+
+ # Provides phantomjs, firefox and xvfb
+ class { '::contint::browsers':
+ }
+
+ # For Selenium jobs recording (T113520)
+ package { 'libav-tools':
+ ensure => present,
+ }
+
+}
diff --git a/modules/role/manifests/ci/slave/browsertests.pp
b/modules/role/manifests/ci/slave/browsertests.pp
index 1e5bf21..687fb06 100644
--- a/modules/role/manifests/ci/slave/browsertests.pp
+++ b/modules/role/manifests/ci/slave/browsertests.pp
@@ -10,7 +10,7 @@
}
include role::ci::slave::labs::common
- include contint::browsertests
+ include profile::ci::browsertests
# For CirrusSearch testing:
$redis_port = '6379'
--
To view, visit https://gerrit.wikimedia.org/r/392956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1cfa0a174fc8ef4d0f75bcb35b7461d6351b6e4
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
