Skip to content

Commit

Permalink
[ckan#4430] run solr locally so we can override schema
Browse files Browse the repository at this point in the history
  • Loading branch information
wardi committed Aug 31, 2018
1 parent 04457bb commit af59d89
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
name: ckan-postgres
- image: redis:3
name: ckan-redis
- image: ckan/solr:latest
name: ckan-solr

parallelism: 4

Expand All @@ -38,14 +36,18 @@ jobs:
apt install -y nodejs
;;
esac
apt install -y nodejs postgresql-client
apt install -y postgresql-client solr-jetty openjdk-8-jdk
# Python Dependencies
pip install -r requirement-setuptools.txt
pip install -r requirements.txt
pip install -r dev-requirements.txt
python setup.py develop
# SOLR config
cp ~/project/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml
service jetty9 restart || true # erroring out but does seem to work
# Database Creation
psql --host=ckan-postgres --username=ckan --command="CREATE USER ${CKAN_POSTGRES_USER} WITH PASSWORD '${CKAN_POSTGRES_PWD}' NOSUPERUSER NOCREATEDB NOCREATEROLE;"
createdb --encoding=utf-8 --host=ckan-postgres --username=ckan --owner=${CKAN_POSTGRES_USER} ${CKAN_POSTGRES_DB}
Expand Down
2 changes: 1 addition & 1 deletion test-core-circle-ci.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ckan.redis.url = redis://ckan-redis:6379/1

sqlalchemy.url = postgresql://ckan_default:pass@ckan-postgres/ckan_test

solr_url = http://ckan-solr:8983/solr/ckan
solr_url = http://localhost:8080/solr

[loggers]
keys = root, ckan, sqlalchemy
Expand Down

0 comments on commit af59d89

Please sign in to comment.