Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/292598

Change subject: dib: php5 on Jessie images
......................................................................

dib: php5 on Jessie images

We can now get php5 on Jessie since php5-fss is gone (T95002). Moreover
the MediaWiki Qunit job need NodeJS 4.3 and PHP.

Bug: T136301
Change-Id: I65d828dbf4e8e8d4568ebb1992ccb397a4bbb4b6
---
M dib/puppet/ciimage.pp
1 file changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/98/292598/1

diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 25dc0a5..4e66095 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -19,12 +19,8 @@
 include contint::packages::base
 include contint::composer
 include contint::php
-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.
-    # Jessie lacks php5-fss T95002. PHP is provided via HHVM.
-    include mediawiki::packages::php5
-}
+include mediawiki::packages::php5
+
 package { 'cron':
     ensure => present,
     before => Class['contint::hhvm'],

-- 
To view, visit https://gerrit.wikimedia.org/r/292598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65d828dbf4e8e8d4568ebb1992ccb397a4bbb4b6
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to