feat(upgrade): backport some features from the ES7 branch which may b…

…e ok to use now

mappings/partial/shape.json

@@ -1,5 +1,3 @@
 {
-  "type": "geo_shape",
-  "tree": "quadtree",
-  "tree_levels": "20"
+  "type": "geo_shape"
 }

scripts/setup_ci.sh

@@ -22,9 +22,15 @@ if [[ "${ES_VERSION}" == "2.4"* ]]; then
   # start elasticsearch server
   /tmp/elasticsearch/bin/elasticsearch --daemonize --path.data /tmp
 else
+  FILENAME="elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz"
+
+  # prior to ES7 the architecture was not included in the filename
+  if [[ "${ES_VERSION}" == "5"* || "${ES_VERSION}" == "6"* ]]; then
+    FILENAME="elasticsearch-${ES_VERSION}.tar.gz"
+  fi
 
   # download from new host
-  wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz \
+  wget -O - "https://artifacts.elastic.co/downloads/elasticsearch/${FILENAME}" \
     | tar xz --directory=/tmp/elasticsearch --strip-components=1
 
   # install ICU plugin

settings.js

@@ -43,8 +43,8 @@ function generate(){
             "lowercase",
             "icu_folding",
             "trim",
-            "word_delimiter",
             "custom_admin",
+            "word_delimiter",
             "unique_only_same_position",
             "notnull",
             "flatten_graph"

test/fixtures/expected.json

@@ -23,8 +23,8 @@
             "lowercase",
             "icu_folding",
             "trim",
-            "word_delimiter",
             "custom_admin",
+            "word_delimiter",
             "unique_only_same_position",
             "notnull",
             "flatten_graph"
@@ -1156,9 +1156,7 @@
           "type": "geo_point"
         },
         "shape": {
-          "type": "geo_shape",
-          "tree": "quadtree",
-          "tree_levels": "20"
+          "type": "geo_shape"
         },
         "bounding_box": {
           "type": "keyword",
@@ -1230,4 +1228,4 @@
       "dynamic": "strict"
     }
   }
-}
+}