Andrew Bogott has submitted this change and it was merged.
Change subject: contint: fix browsertests dependencies
......................................................................
contint: fix browsertests dependencies
package ruby1.9 does not exist :( sorry. We really want ruby1.9.3 which
is installed on the production slaves:
ruby1.9 -> ruby1.9.3
Also since we are going to install MediaWiki, we might want Apache and
other php5 packages installed. That is required before setting up the
vhost.
Change-Id: I37c9989eae70e843675171d0ca4e78cd3887eaef
---
M modules/contint/manifests/browsertests.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index ead8eec..a113b05 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -13,17 +13,21 @@
package { [
'ruby-bundler', # installer for qa/browsertests.git
'rubygems', # dependency of ruby-bundler
- 'ruby1.9', # state of the art ruby
+ 'ruby1.9.3', # state of the art ruby
'phantomjs', # headless browser
]:
ensure => present
}
+
+ # Set up all packages required for MediaWiki (includes Apache)
+ package { 'wikimedia-task-appserver': ensure => present }
# And we need a vhost :-)
contint::localvhost { 'browsertests':
port => 9413,
docroot => $docroot,
log_prefix => 'browsertests',
+ require => Package['wikimedia-task-appserver'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37c9989eae70e843675171d0ca4e78cd3887eaef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
