Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392925 )
Change subject: Move contint::hhvm to a profile
......................................................................
Move contint::hhvm to a profile
Two resolved violations:
modules/contint/manifests/hhvm.pp:5
class 'contint::hhvm' declares class hhvm from another module
modules/role/manifests/ci/slave/labs.pp:34
role 'role::ci::slave::labs' includes contint::hhvm which is neither a
role nor a profile
Change-Id: I66b2a0e2f698f6e1fd095a90532bd6e4b16eb4eb
---
R modules/profile/manifests/ci/hhvm.pp
M modules/role/manifests/ci/slave/labs.pp
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/hhvm.pp
b/modules/profile/manifests/ci/hhvm.pp
similarity index 94%
rename from modules/contint/manifests/hhvm.pp
rename to modules/profile/manifests/ci/hhvm.pp
index fa36f30..f4d827a 100644
--- a/modules/contint/manifests/hhvm.pp
+++ b/modules/profile/manifests/ci/hhvm.pp
@@ -1,6 +1,7 @@
-class contint::hhvm {
+class profile::ci::hhvm {
- include ::contint::packages::hhvm
+ class { '::contint::packages::hhvm':
+ }
class { '::hhvm':
# No need for a hhvm service on CI slaves T126594
diff --git a/modules/role/manifests/ci/slave/labs.pp
b/modules/role/manifests/ci/slave/labs.pp
index 2c16aed..e4f8318 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -31,7 +31,7 @@
# Include package unsafe for production
include contint::packages::labs
- include contint::hhvm
+ include profile::ci::hhvm
include contint::php
--
To view, visit https://gerrit.wikimedia.org/r/392925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I66b2a0e2f698f6e1fd095a90532bd6e4b16eb4eb
Gerrit-PatchSet: 4
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
