Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323803
Change subject: dib: apache::mod::php5 solely for Jessie
......................................................................
dib: apache::mod::php5 solely for Jessie
That breaks provisionning of the Trusty image due to apache2 status
trying to write to /run/lock/ which does not exist in a chroot. Somehow
Jessie is not affected.
We only have a few jobs running on Trusty and none needs Apache2, hence
move apache::mod::php5 included under a Jessie conditional.
Change-Id: Ide191bcb8ddeb11be7507f732d29428679253dac
---
M dib/puppet/ciimage.pp
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/03/323803/1
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 64f0f1e..414b21b 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -20,10 +20,6 @@
include contint::composer
include contint::php
-# FIXME: hack, our manifests no more ship libapache2-mod-php5
-# See T144802
-include ::apache::mod::php5
-
include mediawiki::packages::php5
package { 'cron':
@@ -96,6 +92,11 @@
# Qunit/Selenium related
include contint::browsers
+
+ # FIXME: hack, our manifests no more ship libapache2-mod-php5
+ # See T144802
+ include ::apache::mod::php5
+
# For Selenium jobs video recording (T113520)
require_package('libav-tools')
--
To view, visit https://gerrit.wikimedia.org/r/323803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide191bcb8ddeb11be7507f732d29428679253dac
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
