Hello Paladox, Hashar, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/361496
to review the following change.
Change subject: Revert "Remove packages from Trusty instances"
......................................................................
Revert "Remove packages from Trusty instances"
This reverts commit 997aa879678fcc63f4a7400d88ec31ecad14b66c.
Change-Id: I6db2f3c538e5318cda74a1d9f57b0e69dcec3aa9
---
M dib/puppet/ciimage.pp
1 file changed, 15 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/96/361496/1
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 32f2060..0a21480 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -33,6 +33,7 @@
}
}
+include contint::packages::javascript
class { '::apt':
use_proxy => false,
}
@@ -70,6 +71,20 @@
# 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 {
@@ -92,24 +107,11 @@
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
--
To view, visit https://gerrit.wikimedia.org/r/361496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6db2f3c538e5318cda74a1d9f57b0e69dcec3aa9
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
