Fix the rolling upgrade tests.

Author: jtibshirani

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml

@@ -25,15 +25,15 @@
       bulk:
         refresh: true
         body:
-          - '{"index": {"_index": "test_search_template", "_type": "doc"}}'
+          - '{"index": {"_index": "test_search_template"}}'
           - '{"f1": "v1_old"}'
-          - '{"index": {"_index": "test_search_template", "_type": "doc"}}'
+          - '{"index": {"_index": "test_search_template"}}'
           - '{"f1": "v2_old"}'
-          - '{"index": {"_index": "test_search_template", "_type": "doc"}}'
+          - '{"index": {"_index": "test_search_template"}}'
           - '{"f1": "v3_old"}'
-          - '{"index": {"_index": "test_search_template", "_type": "doc"}}'
+          - '{"index": {"_index": "test_search_template"}}'
           - '{"f1": "v4_old"}'
-          - '{"index": {"_index": "test_search_template", "_type": "doc"}}'
+          - '{"index": {"_index": "test_search_template"}}'
           - '{"f1": "v5_old"}'
 
   - do:
@@ -65,21 +65,19 @@
         index: queries
         body:
           mappings:
-            doc:
-              properties:
-                query:
-                  type: percolator
-                field1:
-                  type: keyword
-                field2:
-                  type: keyword
-                field3:
-                  type: keyword
+            properties:
+              query:
+                type: percolator
+              field1:
+                type: keyword
+              field2:
+                type: keyword
+              field3:
+                type: keyword
 
   - do:
        index:
          index: queries
-         type: doc
          id: q1
          body:
           query:
@@ -89,7 +87,6 @@
   - do:
       index:
         index: queries
-        type: doc
         id: q2
         body:
           query:
@@ -103,7 +100,6 @@
   - do:
       index:
         index: queries
-        type: doc
         id: q3
         body:
           query:
@@ -176,15 +172,15 @@
       bulk:
         refresh: true
         body:
-          - '{"index": {"_index": "reindexed_index", "_type": "doc"}}'
+          - '{"index": {"_index": "reindexed_index"}}'
           - '{"f1": "1"}'
-          - '{"index": {"_index": "reindexed_index", "_type": "doc"}}'
+          - '{"index": {"_index": "reindexed_index"}}'
           - '{"f1": "2"}'
-          - '{"index": {"_index": "reindexed_index", "_type": "doc"}}'
+          - '{"index": {"_index": "reindexed_index"}}'
           - '{"f1": "3"}'
-          - '{"index": {"_index": "reindexed_index", "_type": "doc"}}'
+          - '{"index": {"_index": "reindexed_index"}}'
           - '{"f1": "4"}'
-          - '{"index": {"_index": "reindexed_index", "_type": "doc"}}'
+          - '{"index": {"_index": "reindexed_index"}}'
           - '{"f1": "5"}'
 
   - do:
@@ -215,9 +211,8 @@
         index: all-index
         body:
           mappings:
-            type:
-              _all:
-                enabled: false
-              properties:
-                field:
-                  type: text
+            _all:
+              enabled: false
+            properties:
+              field:
+                type: text

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml

@@ -134,6 +134,7 @@
 
   - do:
       indices.get_mapping:
+        include_type_name: false
         index: all-index
 
   - is_true: all-index.mappings._all