Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361469 )
Change subject: Remove packages from Trusty instances
......................................................................
Remove packages from Trusty instances
Lot of jobs have been shifted from Trusty to Jessie. Clean out various
packages from Trusty instances.
Change-Id: Ia94b3d74b784ff7f6aead604511ae1d4819c1ec3
---
M dib/puppet/ciimage.pp
1 file changed, 13 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/69/361469/1
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 0a21480..32f2060 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -33,7 +33,6 @@
}
}
-include contint::packages::javascript
class { '::apt':
use_proxy => false,
}
@@ -71,20 +70,6 @@
# From mediawiki::packages (which we do not want because of texlive)
require_package('djvulibre-bin')
-include contint::packages::ruby
-
-# Install from gem
-if os_version('debian >= jessie') {
- package { 'jsduck':
- ensure => present,
- provider => 'gem',
- require => [
- Class['::contint::packages::ruby'],
- Package['build-essential'],
- ],
- }
-}
-
# Overrides
class standard {
@@ -107,12 +92,25 @@
if os_version('debian >= jessie') {
include contint::packages::doxygen
include contint::packages::java
+ include contint::packages::javascript
include contint::packages::python
+ include contint::packages::ruby
+
# Qunit/Selenium related
include contint::browsers
+ # Install from gem
+ package { 'jsduck':
+ ensure => present,
+ provider => 'gem',
+ require => [
+ Class['::contint::packages::ruby'],
+ Package['build-essential'],
+ ],
+ }
+
# FIXME: hack, our manifests no more ship libapache2-mod-php5
# See T144802
include ::apache::mod::php5
--
To view, visit https://gerrit.wikimedia.org/r/361469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia94b3d74b784ff7f6aead604511ae1d4819c1ec3
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
