Muehlenhoff has submitted this change and it was merged.
Change subject: Stop installing PHP on jessie app servers
......................................................................
Stop installing PHP on jessie app servers
Moving to jessie seems like a good point to stop pulling in php.
CI still needs it, though.
Change-Id: Iac029f584e2c3592a4fa88eb857d83462ef60171
---
M modules/contint/manifests/packages.pp
M modules/mediawiki/manifests/packages.pp
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 65b4433..aab7b8d 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -8,6 +8,12 @@
# Basic utilites needed for all Jenkins slaves
include ::contint::packages::base
+ # We're no longer installing PHP on app servers starting with
+ # jessie, but we still need it for CI
+ if os_version('debian == jessie') {
+ include ::mediawiki::packages::php5
+ }
+
require_package('openjdk-7-jdk')
# MediaWiki doc is built directly on contint1001
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index c952b00..8e84957 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -5,7 +5,7 @@
# Precise is still used on CI slaves for PHP 5.3 tests
if os_version('ubuntu < trusty') {
include ::mediawiki::packages::legacy
- } else {
+ } elsif os_version('ubuntu == trusty') {
include ::mediawiki::packages::php5
}
--
To view, visit https://gerrit.wikimedia.org/r/291909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac029f584e2c3592a4fa88eb857d83462ef60171
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
