Skip to content

Commit

Permalink
[ckan#766] Move solr configuration to travis-run-tests
Browse files Browse the repository at this point in the history
I was unable to run Jetty-Solr's configuration on travis-install-dependencies.
Probably something to do with Bash's "set -e", but I was unable to pinpoint
exactly, so I left it into travis-run-tests. No big deal.
  • Loading branch information
vitorbaptista committed Oct 22, 2013
1 parent 1aee242 commit 4c46078
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 0 additions & 6 deletions bin/travis-install-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions bin/travis-run-tests
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#!/bin/bash

# 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 &
Expand Down

0 comments on commit 4c46078

Please sign in to comment.