Commit 987e8763a0aceca17a55f2212909e055fb115fef

Authored by Sergio Oliveira
1 parent 1e8f7e3d
Exists in test

Allow solr to run in background

Showing 2 changed files with 13 additions and 3 deletions   Show diff stats
Makefile
... ... @@ -2,10 +2,12 @@
2 2 WHEEL_DIR = .colab-wheel/
3 3  
4 4 DJANGO_SETTINGS_MODULE = tests.settings
5   -export DJANGO_SETTINGS_MODULE
6 5 COLAB_SETTINGS = tests/settings.yaml
7   -export COLAB_SETTINGS
  6 +SOLR_VERSION = 4.10.3
8 7  
  8 +export DJANGO_SETTINGS_MODULE
  9 +export COLAB_SETTINGS
  10 +export SOLR_VERSION
9 11  
10 12 all:
11 13 pip install wheel
... ... @@ -20,7 +22,10 @@ install_solr: install
20 22 which yum && sudo yum install java -y || echo # rpm
21 23  
22 24 colab-admin build_solr_schema > /tmp/schema.xml
23   - SOLR_VERSION=4.10.3 SOLR_CONFS="/tmp/schema.xml" ci/install_solr.sh
  25 + SOLR_CONFS="/tmp/schema.xml" ci/install_solr.sh
  26 +
  27 +run_solr:
  28 + cd solr-$(SOLR_VERSION)/example/; java -jar start.jar
24 29  
25 30 test_install: install_solr
26 31 pip install flake8
... ...
circle.yml
... ... @@ -8,6 +8,11 @@ dependencies:
8 8 - ".colab-wheel/"
9 9 - "solr-4.10.3.tgz"
10 10  
  11 +database:
  12 + post:
  13 + - make run_solr:
  14 + background: true
  15 +
11 16 test:
12 17 override:
13 18 - make test
... ...