Revert "Revert the solr configuration"

This reverts commit ceeb8ea.
ckan · Nov 15, 2013 · 4182f97 · 4182f97
1 parent ceeb8ea
commit 4182f97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies
@@ -35,12 +35,6 @@ python setup.py develop
 # Install npm dpes for mocha
 npm install -g mocha-phantomjs phantomjs
 
-# Configure Solr
-echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
-# FIXME the solr schema cannot be hardcoded as it is dependent on the ckan version
-sudo cp ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml
-sudo service jetty restart
-
 paster db init -c test-core.ini
 
 # If Postgres >= 9.0, we don't need to use datastore's legacy mode.

diff --git a/bin/travis-run-tests b/bin/travis-run-tests
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+# Configure Solr
+echo "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
+# FIXME the solr schema cannot be hardcoded as it is dependent on the ckan version
+sudo cp ckan/config/solr/schema-2.0.xml /etc/solr/conf/schema.xml
+sudo service jetty restart
+
 # Run mocha front-end tests
 # We need ckan to be running for some tests
 paster serve test-core.ini &