Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353964 )
Change subject: contint: skip hhvm experimental pin on Trusty
......................................................................
contint: skip hhvm experimental pin on Trusty
Apt::Pin['hhvm-from-experimental'] is only defined on Jessie, hence on
Trusty that would end up failling.
More realisticly, we have to remove HHVM entirely from Trusty nodes.
Bug: T165462
Change-Id: Iaae6dc5a1a4d4218017169f3069a40a79807533e
---
M modules/contint/manifests/hhvm.pp
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/hhvm.pp
b/modules/contint/manifests/hhvm.pp
index e040ab7..8e697fa 100644
--- a/modules/contint/manifests/hhvm.pp
+++ b/modules/contint/manifests/hhvm.pp
@@ -5,16 +5,16 @@
package => '/^hhvm.*/',
pin => 'release o=Wikimedia,c=experimental',
priority => '1002',
+ before => [
+ Class['::contint::packages::hhvm'],
+ Class['::hhvm'],
+ ]
}
}
- class { '::contint::packages::hhvm':
- require => Apt::Pin['hhvm-from-experimental'],
- }
+ include ::contint::packages::hhvm
class { '::hhvm':
- require => Apt::Pin['hhvm-from-experimental'],
-
# No need for a hhvm service on CI slaves T126594
# lint:ignore:ensure_first_param
service_params => {
--
To view, visit https://gerrit.wikimedia.org/r/353964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaae6dc5a1a4d4218017169f3069a40a79807533e
Gerrit-PatchSet: 14
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
