Default to Elasticsearch 1.2.4 in Travis

.travis.yml

@@ -10,13 +10,13 @@ env:
   - PIP_DOWNLOAD_CACHE="pip_cache"
   matrix:
   - TEST_SUITE=lint
-  - TEST_SUITE=ui ELASTICSEARCH_VERSION=1.2.4
-  - TEST_SUITE=ui MARK_EXPRESSION=smoke ELASTICSEARCH_VERSION=1.2.4
-  - TEST_SUITE=django ELASTICSEARCH_VERSION=1.2.4
+  - TEST_SUITE=ui
+  - TEST_SUITE=ui MARK_EXPRESSION=smoke
+  - TEST_SUITE=django
 matrix:
   fast_finish: true
   allow_failures:
-   - env: TEST_SUITE=ui ELASTICSEARCH_VERSION=1.2.4
+   - env: TEST_SUITE=ui
 cache:
   directories:
   - /home/travis/virtualenv

scripts/travis/install.sh

@@ -32,6 +32,8 @@ echo
 
 
 echo "Installing ElasticSearch"
+# Default to ES version 1.2.4, but allow overrides from the environment
+ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-1.2.4}
 es_tarball="vendor/tarballs/elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz"
 if [[ ! -f $es_tarball ]]; then
   echo "Invalid version ElasticSearch. Can't find ${es_tarball}."

scripts/travis/setup.sh

@@ -54,6 +54,7 @@ echo "Updating product details"
 python manage.py update_product_details
 
 echo "Starting ElasticSearch"
+ELASTICSEARCH_VERSION=${ELASTICSEARCH_VERSION:-1.2.4}
 pushd elasticsearch-${ELASTICSEARCH_VERSION}
   # New version of ES are foreground by default, old ones are backgrounded by default
   if [[ $ELASTICSEARCH_VERSION == '1.2.4' ]]; then