Filippo Giunchedi has submitted this change and it was merged.

Change subject: contint: drop jsduck from Debian slaves
......................................................................


contint: drop jsduck from Debian slaves

We had ruby-jsduck as a Debian package which was used when we had
production slaves.  Nowadays we run everything on labs slaves and can't
install jsduck straight from rubygems.org

Stop installing ruby-jsduck on Debian slaves. We still keep it for
Ubuntu though since Jenkins jobs have not been migrated yet.

Bug: T95008
Change-Id: If5a111447024b208e24d3363aa4f61deb2091e2c
---
M modules/contint/manifests/packages.pp
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 497221c..91cdf32 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -75,7 +75,6 @@
 
         'doxygen',
         'python-sphinx',  # python documentation
-        'ruby-jsduck',
         ]:
         ensure => present,
     }
@@ -144,6 +143,15 @@
         ensure => present,
     }
 
+    # JSDuck was built for Ubuntu ( T48236/ T82278 )
+    # It is a pain to rebuild for Jessie so give up (T95008), we will use
+    # bundler/rubygems instead
+    if $::operatingsystem == 'Ubuntu' {
+        package { 'ruby-jsduck':
+            ensure => present,
+        }
+    }
+
     # Packages to support use of rspec on puppet modules:
     package { [
     # Packages imported from Debian Sid:

-- 
To view, visit https://gerrit.wikimedia.org/r/225866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5a111447024b208e24d3363aa4f61deb2091e2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
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

Reply via email to