jenkins-bot has submitted this change and it was merged.
Change subject: dib: composer and HHVM on Jessie
......................................................................
dib: composer and HHVM on Jessie
Get composer installed on Jessie by moving the include out of the
os_version() condition.
We should install php5 using mediawiki::packages::php5 but that one
ships php5-fss which is not needed on Zend 5.5+ and is not built on
Jessie (see T95002 for discussion). Thus install HHVM to provide a PHP
interpreter.
Bug: T128092
Change-Id: I41f7aaee6496a59ae8662d9e388955b108b7dbb0
---
M dib/puppet/ciimage.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 0efcb06..582f42d 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -34,11 +34,14 @@
include contint::packages::base
+include contint::composer
if os_version('ubuntu >= trusty') {
# We dont run PHP based jobs on Jessie yet since we match Wikimedia
# production which has MediaWiki running on Trusty.
- include contint::composer
include mediawiki::packages::php5
+} elsif os_version('debian >= jessie') {
+ # Lack php5-fss T95002. Provide PHP via HHVM for now.
+ include contint::hhvm
}
if os_version('debian >= jessie') {
--
To view, visit https://gerrit.wikimedia.org/r/285514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I41f7aaee6496a59ae8662d9e388955b108b7dbb0
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
