Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: contint: update browsers package names for Jessie
......................................................................
contint: update browsers package names for Jessie
Some packages providing browsers have different names in Debian compared
to Ubuntu:
firefox -> iceweasel
chromium-browser -> chromium
Do not bother installing phantomjs on Jessie. It is not available and we
are going to drop its usage entirely.
While at it, auto update firefox/iceweasel since Jessie receives
updates.
Bug: T95000
Change-Id: I74917f1feace18d560c3c4a96162aa2eb2f01978
---
M modules/contint/manifests/browsers.pp
1 file changed, 18 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/browsers.pp
b/modules/contint/manifests/browsers.pp
index 7cbcbdb..d738f70 100644
--- a/modules/contint/manifests/browsers.pp
+++ b/modules/contint/manifests/browsers.pp
@@ -1,8 +1,6 @@
class contint::browsers {
package { [
- 'phantomjs',
- 'firefox',
# Without xfonts-cyrillic Xvdb emits warning:
# "[dix] Could not init font path element
/usr/share/fonts/X11/cyrillic"
'xfonts-cyrillic',
@@ -10,10 +8,27 @@
ensure => present,
}
- package { 'chromium-browser':
+ if os_version( 'debian >= lenny' ) {
+ # Debian
+ $latest_packages = [
+ 'chromium',
+ 'iceweasel', # rebranded firefox
+ # phantomjs is not available on Jessie
+ ]
+ } else {
+ # Ubuntu
+ $latest_packages = [
+ 'chromium-browser',
+ 'firefox',
+ 'phantomjs',
+ ]
+ }
+
+ package { $latest_packages:
ensure => latest,
}
+
class { 'xvfb':
display => 94,
resolution => '1280x1024x24',
--
To view, visit https://gerrit.wikimedia.org/r/201711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74917f1feace18d560c3c4a96162aa2eb2f01978
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
