Dzahn has submitted this change and it was merged.
Change subject: contint: for Jessie s/ruby1.9.3/ruby2.1/
......................................................................
contint: for Jessie s/ruby1.9.3/ruby2.1/
ruby1.9.3 is on Ubuntu Precise and Trusty.
Debian Jessie has ruby2.1
Same for the -dev package.
Bug: T103600
Change-Id: Ifa94a2038d47d2976374f7b0790fa6374c742677
---
M modules/contint/manifests/browsertests.pp
M modules/contint/manifests/packages.pp
2 files changed, 23 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index f1069cb..913fb6d 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -8,10 +8,17 @@
# Provides phantomjs, firefox and xvfb
include contint::browsers
- package { [
- 'ruby1.9.1-dev', # for qa/browsertests.git (bundler compiles gems)
- ]:
- ensure => present
+ if os_version('ubuntu <= trusty') {
+ package { [
+ 'ruby1.9.1-dev', # for qa/browsertests.git (bundler compiles gems)
+ ]:
+ ensure => present
+ }
+ }
+ if os_version('debian >= jessie') {
+ package { 'ruby2.1-dev':
+ ensure => present,
+ }
}
# Ruby gems is provided within ruby since Trusty
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 91cdf32..c866278 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -59,7 +59,6 @@
'asciidoc',
'rake',
- 'ruby1.9.3', # To let us syntax check scripts using 1.9
'pep8',
'pyflakes',
@@ -115,6 +114,18 @@
}
}
+ # Ruby
+ if os_version('ubuntu <= trusty') {
+ package { 'ruby1.9.3':
+ ensure => present,
+ }
+ }
+ if os_version('debian >= jessie') {
+ package { 'ruby2.1':
+ ensure => present,
+ }
+ }
+
# these packages are used by the tests for wikistats to parse the
# generated reports to see if they are correct
package { [
--
To view, visit https://gerrit.wikimedia.org/r/220308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa94a2038d47d2976374f7b0790fa6374c742677
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
