Allow solr to run in background

Sergio Oliveira
1 parent 1e8f7e3d
Showing 2 changed files with 13 additions and 3 deletions Show diff stats
Makefile
circle.yml
@@ -2,10 +2,12 @@
 WHEEL_DIR = .colab-wheel/
  
 DJANGO_SETTINGS_MODULE = tests.settings
-export DJANGO_SETTINGS_MODULE
 COLAB_SETTINGS = tests/settings.yaml
-export COLAB_SETTINGS
+SOLR_VERSION = 4.10.3
  
+export DJANGO_SETTINGS_MODULE
+export COLAB_SETTINGS
+export SOLR_VERSION
  
 all:
 	pip install wheel
@@ -20,7 +22,10 @@ install_solr: install
 	which yum && sudo yum install java -y || echo # rpm
  
 	colab-admin build_solr_schema > /tmp/schema.xml
-	SOLR_VERSION=4.10.3  SOLR_CONFS="/tmp/schema.xml" ci/install_solr.sh
+	SOLR_CONFS="/tmp/schema.xml" ci/install_solr.sh
+
+run_solr:
+	cd solr-$(SOLR_VERSION)/example/; java -jar start.jar
  
 test_install: install_solr
 	pip install flake8
@@ -8,6 +8,11 @@ dependencies:
     - ".colab-wheel/"
     - "solr-4.10.3.tgz"
  
+database:
+  post:
+    - make run_solr:
+        background: true
+
 test:
   override:
     - make test
...	...	@@ -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
...	...