EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209648
Change subject: Enable commons for use in cirrusearch test suite
......................................................................
Enable commons for use in cirrusearch test suite
Change-Id: Ic50a01f44915731858e57ec110537b79bf923166
---
A puppet/modules/elasticsearch/templates/CirrusSearch-commons.php.erb
M puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
M puppet/modules/role/manifests/cirrussearch.pp
3 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/48/209648/1
diff --git
a/puppet/modules/elasticsearch/templates/CirrusSearch-commons.php.erb
b/puppet/modules/elasticsearch/templates/CirrusSearch-commons.php.erb
new file mode 100644
index 0000000..72a42b6
--- /dev/null
+++ b/puppet/modules/elasticsearch/templates/CirrusSearch-commons.php.erb
@@ -0,0 +1,5 @@
+$wgCirrusSearchNamespaceMappings[ NS_FILE ] = 'file';
+$wgCirrusSearchReplicaCount['file'] = 1;
+$wgCirrusSearchShardCount['file'] = 1;
+// Undo global config that includes commons files in other wikis search results
+unset( $wgCirrusSearchExtraIndexes[ NS_FILE ] );
diff --git a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
index d07da04..6afe0cb 100644
--- a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
+++ b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
@@ -1 +1,2 @@
include_once
"$IP/extensions/CirrusSearch/tests/jenkins/FullyFeaturedConfig.php";
+$wgCirrusSearchExtraIndexes[ NS_FILE ] = array( 'commonswiki_file' );
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index 296fb92..0013970 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -2,10 +2,13 @@
# The CirrusSearch extension implements searching for MediaWiki using
# Elasticsearch.
class role::cirrussearch {
+ include ::role::commons
include ::role::timedmediahandler
include ::role::pdfhandler
include ::role::cite
include ::elasticsearch
+ # not strictly required for cirrussearch, but used in the tests
+ include ::role::svg
require_package('jq')
@@ -61,6 +64,10 @@
values => template('elasticsearch/CirrusSearchTest.php.erb'),
}
+ mediawiki::settings { 'commons:cirrussearch':
+ values => template('elasticsearch/CirrusSearch-commons.php.erb'),
+ }
+
# By default vagrant sets up firefox as the global browsertest runner, we
want
# to ensure phantomjs is available for running the cirrussearch tests in a
# headless and parallelized maner
--
To view, visit https://gerrit.wikimedia.org/r/209648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic50a01f44915731858e57ec110537b79bf923166
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
