[ckan#4430] run solr locally so we can override schema

Author: wardi

.circleci/config.yml

@@ -21,8 +21,6 @@ jobs:
         name: ckan-postgres
       - image: redis:3
         name: ckan-redis
-      - image: ckan/solr:latest
-        name: ckan-solr
 
     parallelism: 4
 
@@ -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}

test-core-circle-ci.ini

@@ -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