Switch to the new elasticsearch testing regime

.travis-install.sh

@@ -1,11 +1,7 @@
-# /usr/bin/env sh
+#!/bin/bash
+
 pip install tox
 
 if [ "$TOXENV" = 'py34' ]; then
     pip install coveralls
 fi
-
-if [ "$ES_URL" != 'no' ]; then
-    mkdir /tmp/elasticsearch
-    wget -O - "$ES_URL" | tar xz --directory=/tmp/elasticsearch --strip-components=1
-fi

.travis.yml

@@ -3,11 +3,12 @@ python: "3.5"
 cache: pip
 
 env:
-    - TOXENV=py34 DEPLOY=no ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.2.2.tar.gz
-    - TOXENV=py35 DEPLOY=no ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.2.2.tar.gz
-    - TOXENV=py34 DEPLOY=yes ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.3.tar.gz
-    - TOXENV=py35 DEPLOY=no ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.3.tar.gz
-    - TOXENV=pep8 ES_URL=no DEPLOY=no
+    - TOXENV=py34 DEPLOY=no ES_VERSION=2.2.2
+    - TOXENV=py35 DEPLOY=no ES_VERSION=2.2.2
+    - TOXENV=py34 DEPLOY=yes ES_VERSION=2.4.3
+    - TOXENV=py35 DEPLOY=no ES_VERSION=2.4.3
+
+    - TOXENV=pep8 DEPLOY=no
 
 install: ./.travis-install.sh
 

tox.ini

@@ -6,7 +6,7 @@ dependencies = setuptools==18.8.1
                git+git://github.com/OneGov/onegov.testing.git#egg=onegov.testing
 
 [testenv]
-passenv = LANG ES_BINARY
+passenv = LANG ES_VERSION
 
 deps= {[base]dependencies}
       -e{toxinidir}[test]