[TEST] Master tests only track ES-master (5.0 alpha) now

Author: polyfractal

.travis.yml

@@ -13,24 +13,11 @@ php:
   - 5.4
   - hhvm
 
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.6
-      env: ES_VERSION="2.1" TEST_BUILD_REF="origin/2.1"
-    - php: 5.6
-      env: ES_VERSION="2.0" TEST_BUILD_REF="origin/2.0"
-    - php: 5.6
-      env: ES_VERSION="1.7" TEST_BUILD_REF="origin/1.7"
-    - php: 5.6
-      env: ES_VERSION="1.6" TEST_BUILD_REF="origin/1.6"
-  allow_failures:
-    - php: hhvm
 
 env:
   global:
-    - ES_VERSION="2.2"
-    - TEST_BUILD_REF="origin/2.2"
+    - ES_VERSION="master"
+    - TEST_BUILD_REF="origin/master"
     - ES_TEST_HOST=http://localhost:9200
 
 before_install:

travis/download_and_run_es.sh

@@ -19,15 +19,14 @@ echo "Adding repo to config..."
 find . -name "elasticsearch.yml" | while read TXT ; do echo 'repositories.url.allowed_urls: ["http://*"]' >> $TXT ; done
 find . -name "elasticsearch.yml" | while read TXT ; do echo 'path.repo: ["/tmp"]' >> $TXT ; done
 
-
-
 echo "Starting Elasticsearch v${ES_VERSION}"
+
 ./elasticsearch-*/bin/elasticsearch \
-    -Des.network.host=localhost \
-    -Des.discovery.zen.ping.multicast.enabled=false \
-    -Des.discovery.zen.ping_timeout=1s \
-    -Des.http.port=9200 \
-    -Des.node.testattr=test \
+    -E es.network.host=localhost \
+    -E es.discovery.zen.ping_timeout=1s \
+    -E es.http.port=9200 \
+    -E es.discovery.zen.minimum_master_nodes=1 \
     -d
 
+
 sleep 3