test: Sort hits by _id instead of _doc and

cleanup tests by removing unneeded parameter and settings.

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

@@ -96,7 +96,6 @@
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field1: value
   - match: { hits.total: 1 }
@@ -106,11 +105,10 @@
       search:
         index: queries
         body:
-          sort: _doc
+          sort: _id
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field1: value
                 field2: value
@@ -122,7 +120,6 @@
       search:
         index: queries
         body:
-          sort: _doc
           query:
             percolate:
               field: query

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

@@ -107,9 +107,6 @@
       indices.create:
         index: queries
         body:
-          settings:
-            index:
-              number_of_shards: 1
           mappings:
             doc:
               properties:
@@ -172,7 +169,6 @@
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field1: value
   - match: { hits.total: 1 }
@@ -182,11 +178,10 @@
       search:
         index: queries
         body:
-          sort: _doc
+          sort: _id
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field1: value
                 field2: value
@@ -198,11 +193,10 @@
       search:
         index: queries
         body:
-          sort: _doc
+          sort: _id
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field2: value
                 field3: value

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

@@ -92,7 +92,6 @@
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field1: value
   - match: { hits.total: 1 }
@@ -102,11 +101,10 @@
       search:
         index: queries
         body:
-          sort: _doc
+          sort: _id
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field1: value
                 field2: value
@@ -119,11 +117,9 @@
       search:
         index: queries
         body:
-          sort: _doc
           query:
             percolate:
               field: query
-              type: doc
               document:
                 field2: value
                 field3: value