Merge pull request ckan#142 from ckan/fix-tests

Simple fix for tests, use old schema version and avoid master for now
belgium-its-steering-committee · Dec 15, 2016 · 3ddadf3 · 3ddadf3
2 parents 4087fd5 + 1580622
commit 3ddadf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml
@@ -1,11 +1,12 @@
 env:
-- CKAN_VERSION=release-v2.3-latest
+#- CKAN_VERSION=release-v2.3-latest    XXX: disable one until clean db works
 - CKAN_VERSION=release-v2.4-latest
 - CKAN_VERSION=release-v2.5-latest
-- CKAN_VERSION=master
+- CKAN_VERSION=release-v2.6-latest
+- CKAN_VERSION=dev-v2.6
 
 command:
-- cd ckan; git checkout $CKAN_VERSION
+- cd ckan; git reset --hard; git checkout $CKAN_VERSION
 - sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/datastore_default:pass@\/datastore_test/' ckan/test-core.ini
 - sed -i -e 's/solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr\/ckan/' ckan/test-core.ini
 - cp ckan/ckan/public/base/css/main.css ckan/ckan/public/base/css/main.debug.css

diff --git a/circle.yml b/circle.yml
@@ -26,6 +26,7 @@ dependencies:
 database:
   post:
   - cp -R /opt/solr-4.3.1 $SOLR_HOME
+  - cd ckan; git checkout dev-v2.6  # for 2.3 solr schema
   - cd $SOLR_HOME/example; java -jar start.jar >> $HOME/solr.log:
       background: true
   - sudo -E -u postgres ckan/bin/postgres_init/1_create_ckan_db.sh