Browse Source

Remove useless version checks in REST tests. (#30165)

Many tests are added with a version check so that they do not run against a
version that doesn't have the feature yet. Master is 7.0, so all tests that
do not run against 6.0+ can be removed and the version check can be removed
on all tests that always run on 6.0+.
Adrien Grand 7 years ago
parent
commit
231a63fdf8
74 changed files with 4 additions and 734 deletions
  1. 0 3
      modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
  2. 0 3
      modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml
  3. 0 4
      modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
  4. 0 8
      modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
  5. 0 4
      modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml
  6. 0 4
      qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml
  7. 0 8
      rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
  8. 0 8
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
  9. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
  10. 0 8
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml
  11. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yml
  12. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml
  13. 0 7
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
  14. 0 26
      rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yml
  15. 0 12
      rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
  16. 0 5
      rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml
  17. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml
  18. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
  19. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml
  20. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
  21. 0 12
      rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
  22. 0 9
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
  23. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
  24. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml
  25. 0 24
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete/10_basic.yml
  26. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yml
  27. 0 20
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/all_path_options.yml
  28. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/10_basic.yml
  29. 0 6
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml
  30. 0 7
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yml
  31. 0 24
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml
  32. 0 15
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/20_missing_type.yml
  33. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
  34. 0 166
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml
  35. 0 16
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml
  36. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
  37. 0 12
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml
  38. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
  39. 0 12
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/all_path_options.yml
  40. 0 24
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml
  41. 0 8
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml
  42. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml
  43. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml
  44. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/10_basic.yml
  45. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml
  46. 0 6
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/11_metric.yml
  47. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/20_translog.yml
  48. 0 16
      rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/10_basic.yml
  49. 4 9
      rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
  50. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/msearch/20_typed_keys.yml
  51. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml
  52. 0 6
      rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml
  53. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/scroll/11_clear.yml
  54. 0 1
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml
  55. 0 33
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
  56. 0 6
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
  57. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml
  58. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/70_adjacency_matrix.yml
  59. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml
  60. 0 8
      rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text.yml
  61. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/10_unified.yml
  62. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/20_fvh.yml
  63. 0 36
      rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
  64. 0 6
      rest-api-spec/src/main/resources/rest-api-spec/test/search/120_batch_reduce_size.yml
  65. 0 6
      rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml
  66. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/search/150_rewrite_on_coordinator.yml
  67. 0 21
      rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml
  68. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/search/90_search_after.yml
  69. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic.yml
  70. 0 4
      rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml
  71. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/suggest/40_typed_keys.yml
  72. 0 3
      rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/10_basic.yml
  73. 0 4
      x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml
  74. 0 3
      x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/20_security.yml

+ 0 - 3
modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

@@ -2,9 +2,6 @@
 "Custom normalizer with illegal filter in request":
     # Tests analyze api with normalizer. This is in the analysis-common module
     # because there are no filters that support multiTermAware
-    - skip:
-        version: " - 5.99.99"
-        reason:  normalizer support in 6.0.0
     - do:
         catch: bad_request
         indices.analyze:

+ 0 - 3
modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml

@@ -1,9 +1,6 @@
 "Synonym filter with char_filter":
   # Tests analyze with synonym and char_filter. This is in the analysis-common module
   # because there are no char filters in core.
-    - skip:
-        version: " - 5.99.99"
-        reason: to support synonym same analysis chain were added in 6.0.0
     - do:
         indices.create:
           index: test_synonym_with_charfilter

+ 0 - 4
modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml

@@ -13,10 +13,6 @@ setup:
 
 ---
 "Parent/child inner hits":
-    - skip:
-        version: " - 5.5.99"
-        reason:  parent-join was added in 5.6.
-
     - do:
         index:
           index: test

+ 0 - 8
modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml

@@ -59,10 +59,6 @@ setup:
 
 ---
 "Test basic":
-    - skip:
-        version: " - 5.5.99"
-        reason:  parent-join was added in 5.6
-
     - do:
         search:
           body: { sort: ["join_field", "_id"] }
@@ -104,10 +100,6 @@ setup:
 
 ---
 "Test parent_id query":
-    - skip:
-        version: " - 5.5.99"
-        reason:  parent-join was added in 5.6.
-
     - do:
         search:
           body:

+ 0 - 4
modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml

@@ -8,10 +8,6 @@
 ---
 "no query fails":
 
-  - skip:
-      version: " - 5.99.99"
-      reason: explicit query is required since 6.0.0
-
   - do:
       catch: /query is missing/
       delete_by_query:

+ 0 - 4
qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml

@@ -1,9 +1,5 @@
 ---
 "Get simple field caps from remote cluster":
-  - skip:
-      version: " - 5.4.99"
-      reason:  this uses a new API functionality that has been added in 5.5.0
-
   - do:
         indices.create:
           index: field_caps_index_2

+ 0 - 8
rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml

@@ -25,9 +25,6 @@
 
 ---
 "Empty _id":
-  - skip:
-      version: " - 5.3.0"
-      reason: empty IDs were not rejected until 5.3.1
   - do:
       bulk:
         refresh: true
@@ -62,11 +59,6 @@
 ---
 "empty action":
 
-  - skip:
-      version: " - 5.4.99"
-      reason: confusing exception messaged caused by empty object fixed in 5.5.0
-      features: ["headers"]
-
   - do:
       catch: /Malformed action\/metadata line \[3\], expected FIELD_NAME but found \[END_OBJECT\]/
       headers:

+ 0 - 8
rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml

@@ -129,10 +129,6 @@
 ---
 "Multiple alias names":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  multiple aliases are supported only from 6.0.0 on
-
   - do:
         indices.create:
             index: test
@@ -265,10 +261,6 @@
 ---
 "Alias sorting":
 
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
-
   - do:
       indices.create:
         index: test_index

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml

@@ -160,9 +160,6 @@
 
 ---
 "Test cat indices sort":
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
 
   - do:
       indices.create:

+ 0 - 8
rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml

@@ -60,10 +60,6 @@
 
 ---
 "Additional disk information":
-  - skip:
-      version: " - 5.5.99"
-      reason:  additional disk info added in 5.6.0
-
   - do:
       cat.nodes:
           h: diskAvail,diskTotal,diskUsed,diskUsedPercent
@@ -92,10 +88,6 @@
 
 ---
 "Test cat nodes output with full_id set":
-  - skip:
-      version: " - 5.0.0"
-      reason:  The full_id setting was rejected in 5.0.0 see #21266
-
 
   - do:
       cat.nodes:

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yml

@@ -46,9 +46,6 @@
 
 ---
 "Test cat repositories sort":
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
   - do:
       snapshot.create_repository:
         repository: test_cat_repo_1

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml

@@ -86,10 +86,6 @@
 ---
 "Test cat segments on closed index behaviour":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.create:
         index: index1

+ 0 - 7
rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml

@@ -1,8 +1,5 @@
 ---
 "Help":
-  - skip:
-      version: " - 5.99.99"
-      reason: seq no stats were added in 6.0.0
 
   - do:
       cat.shards:
@@ -219,10 +216,6 @@
 
 ---
 "Test cat shards sort":
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
-
   - do:
       indices.create:
         index: foo

+ 0 - 26
rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yml

@@ -1,8 +1,5 @@
 ---
 "Help":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         cat.templates:
           help: true
@@ -17,9 +14,6 @@
 
 ---
 "No templates":
-    - skip:
-        version: " - 5.0.99"
-        reason:  templates were introduced in 5.1.0
     - do:
         cat.templates: {}
 
@@ -31,10 +25,6 @@
 ---
 "Normal templates":
 
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
-
     - do:
         indices.put_template:
           name: test
@@ -83,10 +73,6 @@
 ---
 "Filtered templates":
 
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
-
     - do:
         indices.put_template:
           name: test
@@ -125,9 +111,6 @@
 
 ---
 "Column headers":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test
@@ -161,9 +144,6 @@
 
 ---
 "Select columns":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test
@@ -194,9 +174,6 @@
 
 ---
 "Sort templates":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test
@@ -245,9 +222,6 @@
 
 ---
 "Multiple template":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test_1

+ 0 - 12
rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml

@@ -1,8 +1,4 @@
 "bad cluster shard allocation explanation request":
-  - skip:
-      version: " - 5.5.99"
-      reason: response status on bad request was changed starting in 5.6.0
-
   - do:
       # there aren't any unassigned shards to explain
       catch: /illegal_argument_exception/
@@ -10,10 +6,6 @@
 
 ---
 "cluster shard allocation explanation test":
-  - skip:
-      version: " - 5.1.99"
-      reason: explain API response output was changed starting in 5.2.0
-
   - do:
       indices.create:
         index: test
@@ -40,10 +32,6 @@
 
 ---
 "cluster shard allocation explanation test with empty request":
-  - skip:
-      version: " - 5.1.99"
-      reason: explain API response output was changed starting in 5.2.0
-
   - do:
       indices.create:
         index: test

+ 0 - 5
rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml

@@ -64,11 +64,6 @@
 ---
 "Test get a default settings":
 
-# this can't be bumped to 5.0.2 until snapshots are published
- - skip:
-        version: " - 5.0.3"
-        reason:  Fetching default group setting was buggy until 5.0.3
-
  - do:
       cluster.get_settings:
         include_defaults: true

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml

@@ -1,8 +1,5 @@
 ---
 "Get an empty remote info":
-  - skip:
-      version: " - 5.3.99"
-      reason: this API doesn't exist in 5.3.x yet
   - do:
       cluster.remote_info: {}
   - is_true: ''

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml

@@ -7,10 +7,6 @@
 
 ---
 "get cluster state returns cluster state size with human readable format":
-  - skip:
-      version:  " - 5.99.99"
-      reason:   "cluster state size is only available in v6.0.0 and higher"
-
   - do:
       cluster.state:
         human: true

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml

@@ -21,10 +21,6 @@
 ---
 "Internal versioning with explicit version":
 
- - skip:
-      version: " - 5.1.1"
-      reason: validation logic only fixed from 5.1.2 onwards
-
  - do:
       catch: bad_request
       create:

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml

@@ -1,10 +1,6 @@
 ---
 "External version":
 
- - skip:
-      version: " - 5.1.1"
-      reason: validation logic only fixed from 5.1.2 onwards
-
  - do:
       catch:              bad_request
       create:

+ 0 - 12
rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml

@@ -75,9 +75,6 @@ setup:
 
 ---
 "Get simple field caps":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this uses a new API that has been added in 5.4.0
 
   - do:
       field_caps:
@@ -116,9 +113,6 @@ setup:
   - is_false: fields.geo.keyword.on_aggregatable_indices
 ---
 "Get nested field caps":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this uses a new API that has been added in 5.4.0
 
   - do:
       field_caps:
@@ -147,9 +141,6 @@ setup:
   - is_false: fields.object\.nested2.keyword.non_searchable_indices
 ---
 "Get prefix field caps":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this uses a new API that has been added in 5.4.0
 
   - do:
       field_caps:
@@ -168,9 +159,6 @@ setup:
 
 ---
 "Mix in non-existing field field caps":
-  - skip:
-      version: " - 5.4.0"
-      reason:  "#24504 fixed a bug in this API in 5.4.1"
 
   - do:
       field_caps:

+ 0 - 9
rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

@@ -58,9 +58,6 @@
 
 ---
 "Custom filter in request":
-    - skip:
-        version: " - 5.99.99"
-        reason: token filter name changed in 6.0, so this needs to be skipped on mixed clusters
     - do:
         indices.analyze:
           body:
@@ -81,9 +78,6 @@
 
 ---
 "Synonym filter with tokenizer":
-    - skip:
-        version: " - 5.99.99"
-        reason: to support synonym same analysis chain were added in 6.0.0
     - do:
         indices.create:
           index: test_synonym
@@ -114,9 +108,6 @@
 
 ---
 "Custom normalizer in request":
-    - skip:
-        version: " - 5.99.99"
-        reason:  normalizer support in 6.0.0
     - do:
         indices.analyze:
           body:

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml

@@ -5,10 +5,6 @@
 
 ---
 "clear_cache with request set to false":
-  - skip:
-      version: " - 5.3.99"
-      reason: this name was added in 5.4
-
   - do:
       indices.clear_cache:
         request: false

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml

@@ -32,9 +32,6 @@
 
 ---
 "Create index":
-  - skip:
-      version: " - 5.5.99"
-      reason: create index response contains index name since 5.6.0
 
   - do:
       indices.create:

+ 0 - 24
rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete/10_basic.yml

@@ -10,9 +10,6 @@ setup:
         index: index2
 ---
 "Delete index against alias":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       catch: bad_request
       indices.delete:
@@ -24,9 +21,6 @@ setup:
   - is_true: index2
 ---
 "Delete index against alias - ignore unavailable":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       indices.delete:
         index: alias
@@ -38,9 +32,6 @@ setup:
   - is_true: index2
 ---
 "Delete index against alias -  multiple indices":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       catch: bad_request
       indices.delete:
@@ -52,9 +43,6 @@ setup:
   - is_true: index2
 ---
 "Delete index against alias -  ignore unavailable - multiple indices":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       indices.delete:
         index: alias,index2
@@ -67,9 +55,6 @@ setup:
   - is_false: index2
 ---
 "Delete index against wildcard matching alias":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       indices.delete:
         index: alia*
@@ -80,9 +65,6 @@ setup:
   - is_true: index2
 ---
 "Delete index against wildcard matching alias - disallow no indices":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       catch: missing
       indices.delete:
@@ -95,9 +77,6 @@ setup:
   - is_true: index2
 ---
 "Delete index against wildcard matching alias - multiple indices":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       indices.delete:
         index: alia*,index2
@@ -109,9 +88,6 @@ setup:
   - is_false: index2
 ---
 "Delete index against wildcard matching alias - disallow no indices - multiple indices":
-  - skip:
-      version: " - 5.99.0"
-      reason: delete index doesn't support aliases only from 6.0.0 on
   - do:
       catch: missing
       indices.delete:

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yml

@@ -1,9 +1,5 @@
 ---
 "Basic test for delete alias":
-  - skip:
-      version: " - 5.4.99"
-      reason: Previous versions did not 404 on missing aliases
-
   - do:
       indices.create:
         index: testind

+ 0 - 20
rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/all_path_options.yml

@@ -84,10 +84,6 @@ setup:
 
 ---
 "check delete with index list":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.delete_alias:
         index: "test_index1,test_index2"
@@ -110,10 +106,6 @@ setup:
 
 ---
 "check delete with prefix* index":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.delete_alias:
         index: "test_*"
@@ -137,10 +129,6 @@ setup:
 
 ---
 "check delete with index list and * aliases":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.delete_alias:
         index: "test_index1,test_index2"
@@ -164,10 +152,6 @@ setup:
 
 ---
 "check delete with index list and _all aliases":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.delete_alias:
         index: "test_index1,test_index2"
@@ -191,10 +175,6 @@ setup:
 
 ---
 "check delete with index list and wildcard aliases":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.delete_alias:
         index: "test_index1,test_index2"

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/10_basic.yml

@@ -7,10 +7,6 @@ setup:
 ---
 "Test indices.exists_template":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.exists_template:
         name: test

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml

@@ -1,17 +1,11 @@
 ---
 "Exists type":
- - skip:
-    # this will only run in a mixed cluster environment with at least 1 5.x node
-    version: "5.99.99 - "
-    reason:  multiple types are not supported on 6.x indices onwards
-
  - do:
      indices.create:
        index: test_1
        body:
          mappings:
            type_1: {}
-           type_2: {}
 
  - do:
      indices.exists_type:

+ 0 - 7
rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yml

@@ -137,10 +137,6 @@ setup:
 ---
 "Should return test_index_3 if expand_wildcards=closed":
 
-  - skip:
-      version:     " - 2.0.0"
-      reason:      Requires fix for issue 7258
-
   - do:
       indices.get:
         index: test_index_*
@@ -162,9 +158,6 @@ setup:
 
 ---
 "Should return an exception when querying invalid indices":
- - skip:
-     version: " - 5.99.99"
-     reason: "bad request logic added in 6.0.0"
 
  - do:
      catch: bad_request

+ 0 - 24
rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml

@@ -42,10 +42,6 @@ setup:
 
 ---
 "Get aliases via /_all/_alias/":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.create:
         index: myindex
@@ -62,10 +58,6 @@ setup:
 
 ---
 "Get aliases via /*/_alias/":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.create:
         index: myindex
@@ -82,10 +74,6 @@ setup:
 
 ---
 "Get and index with no aliases via /{index}/_alias/":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.create:
         index: myindex
@@ -222,10 +210,6 @@ setup:
 
 ---
 "Non-existent alias on an existing index returns 404":
-  - skip:
-      version: " - 5.4.99"
-      reason: Previous versions did not 404 on missing aliases
-
   - do:
       catch: missing
       indices.get_alias:
@@ -237,10 +221,6 @@ setup:
 
 ---
 "Existent and non-existent alias returns 404 and the existing alias":
-  - skip:
-      version: " - 5.4.99"
-      reason: Previous versions did not 404 on missing aliases
-
   - do:
       catch: missing
       indices.get_alias:
@@ -253,10 +233,6 @@ setup:
 
 ---
 "Existent and non-existent aliases returns 404 and the existing alias":
-  - skip:
-      version: " - 5.4.99"
-      reason: Previous versions did not 404 on missing aliases
-
   - do:
       catch: missing
       indices.get_alias:

+ 0 - 15
rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/20_missing_type.yml

@@ -1,8 +1,5 @@
 ---
 "Non-existent type returns 404":
-  - skip:
-      version: " - 5.5.99"
-      reason: Previous versions did not 404 on missing types
   - do:
         indices.create:
           index: test_index
@@ -25,9 +22,6 @@
 
 ---
 "No type matching pattern returns 404":
-  - skip:
-      version: " - 5.5.99"
-      reason: Previous versions did not 404 on missing types
   - do:
         indices.create:
           index: test_index
@@ -51,9 +45,6 @@
 
 ---
 "Existent and non-existent type returns 404 and the existing type":
-  - skip:
-      version: " - 5.5.99"
-      reason: Previous versions did not 404 on missing types
   - do:
         indices.create:
           index: test_index
@@ -77,9 +68,6 @@
 
 ---
 "Existent and non-existent types returns 404 and the existing type":
-  - skip:
-      version: " - 5.5.99"
-      reason: Previous versions did not 404 on missing types
   - do:
         indices.create:
           index: test_index
@@ -103,9 +91,6 @@
 
 ---
 "Type missing when no types exist":
-  - skip:
-      version: " - 5.0.2"
-      reason: there was a bug prior to 5.0.2
   - do:
       catch: missing
       indices.get_mapping:

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml

@@ -94,10 +94,6 @@ setup:
 
 ---
 "Get test-* with wildcard_expansion=none":
- - skip:
-    version: " - 5.99.99"
-    reason:  this was a breaking change in 6.0
-
  - do:
     catch: missing
     indices.get_mapping:

+ 0 - 166
rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml

@@ -1,166 +0,0 @@
----
-setup:
-
-  - skip:
-        # this will only run in a mixed cluster environment with at least 1 5.x node
-        version: "5.99.99 - " 
-        reason:  multiple types are not supported on 6.x indices onwards
-
-  - do:
-        indices.create:
-          index: test_1
-          body:
-              mappings:
-                type_1: {}
-                type_2: {}
-  - do:
-        indices.create:
-          index: test_2
-          body:
-              mappings:
-                type_2: {}
-                type_3: {}
-
----
-"Get /_mapping":
-
- - do:
-    indices.get_mapping: {}
-
- - is_true: test_1.mappings.type_1
- - is_true: test_1.mappings.type_2
- - is_true: test_2.mappings.type_2
- - is_true: test_2.mappings.type_3
-
----
-"Get /{index}/_mapping":
-
- - do:
-    indices.get_mapping:
-        index: test_1
-
- - is_true: test_1.mappings.type_1
- - is_true: test_1.mappings.type_2
- - is_false: test_2
-
-
----
-"Get /{index}/_mapping/_all":
-
- - do:
-    indices.get_mapping:
-        index: test_1
-        type:  _all
-
- - is_true: test_1.mappings.type_1
- - is_true: test_1.mappings.type_2
- - is_false: test_2
-
----
-"Get /{index}/_mapping/*":
-
- - do:
-    indices.get_mapping:
-        index: test_1
-        type:  '*'
-
- - is_true: test_1.mappings.type_1
- - is_true: test_1.mappings.type_2
- - is_false: test_2
-
----
-"Get /{index}/_mapping/{type}":
-
- - do:
-    indices.get_mapping:
-        index: test_1
-        type:  type_1
-
- - is_false: test_1.mappings.type_2
- - is_false: test_2
-
----
-"Get /{index}/_mapping/{type,type}":
-
- - do:
-    indices.get_mapping:
-        index: test_1
-        type:  type_1,type_2
-
- - is_true: test_1.mappings.type_1
- - is_true: test_1.mappings.type_2
- - is_false: test_2
-
----
-"Get /{index}/_mapping/{type*}":
-
- - do:
-    indices.get_mapping:
-        index: test_1
-        type:  '*2'
-
- - is_true: test_1.mappings.type_2
- - is_false: test_1.mappings.type_1
- - is_false: test_2
-
----
-"Get /_mapping/{type}":
-
- - do:
-    indices.get_mapping:
-        type: type_2
-
- - is_true: test_1.mappings.type_2
- - is_true: test_2.mappings.type_2
- - is_false: test_1.mappings.type_1
- - is_false: test_2.mappings.type_3
-
----
-"Get /_all/_mapping/{type}":
-
- - do:
-    indices.get_mapping:
-        index: _all
-        type: type_2
-
- - is_true: test_1.mappings.type_2
- - is_true: test_2.mappings.type_2
- - is_false: test_1.mappings.type_1
- - is_false: test_2.mappings.type_3
-
----
-"Get /*/_mapping/{type}":
-
- - do:
-    indices.get_mapping:
-        index: '*'
-        type: type_2
-
- - is_true: test_1.mappings.type_2
- - is_true: test_2.mappings.type_2
- - is_false: test_1.mappings.type_1
- - is_false: test_2.mappings.type_3
-
----
-"Get /index,index/_mapping/{type}":
-
- - do:
-    indices.get_mapping:
-        index: test_1,test_2
-        type: type_2
-
- - is_true: test_1.mappings.type_2
- - is_true: test_2.mappings.type_2
- - is_false: test_2.mappings.type_3
-
----
-"Get /index*/_mapping/{type}":
-
- - do:
-    indices.get_mapping:
-        index: '*2'
-        type: type_2
-
- - is_true: test_2.mappings.type_2
- - is_false: test_1
- - is_false: test_2.mappings.type_3

+ 0 - 16
rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml

@@ -11,10 +11,6 @@ setup:
 ---
 "Get template":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.get_template:
         name: test
@@ -25,10 +21,6 @@ setup:
 ---
 "Get all templates":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.put_template:
         name: test2
@@ -46,10 +38,6 @@ setup:
 ---
 "Get template with local flag":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.get_template:
         name: test
@@ -60,10 +48,6 @@ setup:
 ---
 "Get template with flat settings and master timeout":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.get_template:
         name: test

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml

@@ -1,9 +1,5 @@
 ---
 "Basic test for index open/close":
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.create:
         index: test_index

+ 0 - 12
rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml

@@ -23,10 +23,6 @@ setup:
 
 ---
 "All indices":
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.close:
         index: _all
@@ -50,10 +46,6 @@ setup:
 
 ---
 "Trailing wildcard":
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.close:
         index: test_*
@@ -77,10 +69,6 @@ setup:
 
 ---
 "Only wildcard":
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.close:
         index: '*'

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml

@@ -30,9 +30,6 @@
 
 ---
 "Can't create alias with invalid characters":
-  - skip:
-      version: " - 5.0.99"
-      reason:  alias name validation was introduced in 5.1.0
 
   - do:
       indices.create:

+ 0 - 12
rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/all_path_options.yml

@@ -14,10 +14,6 @@ setup:
 
 ---
 "put alias per index":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.put_alias:
         index: test_index1
@@ -72,10 +68,6 @@ setup:
 
 ---
 "put alias prefix* index":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.put_alias:
         index: "test_*"
@@ -91,10 +83,6 @@ setup:
 
 ---
 "put alias in list of indices":
-  - skip:
-      version: " - 5.99.99"
-      reason:  only requested indices are included in 6.x
-
   - do:
       indices.put_alias:
         index: "test_index1,test_index2"

+ 0 - 24
rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml

@@ -1,10 +1,6 @@
 ---
 "Put template":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.put_template:
         name: test
@@ -25,10 +21,6 @@
 ---
 "Put multiple template":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.put_template:
         name: test
@@ -49,10 +41,6 @@
 ---
 "Put template with aliases":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.put_template:
         name: test
@@ -77,10 +65,6 @@
 ---
 "Put template create":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.put_template:
         name: test
@@ -113,10 +97,6 @@
 ---
 "Test Put Versioned Template":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.put_template:
         name: "my_template"
@@ -214,10 +194,6 @@
 ---
 "Put index template without index_patterns":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  the error message is updated in v6.0.0
-
   - do:
       catch: /index patterns are missing/
       indices.put_template:

+ 0 - 8
rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml

@@ -76,10 +76,6 @@
 
 ---
 "Rollover no condition matched":
-  - skip:
-        version: " - 5.0.0"
-        reason:  bug fixed in 5.0.1
-
   # create index with alias
   - do:
       indices.create:
@@ -108,10 +104,6 @@
 ---
 "Rollover with dry-run but target index exists":
 
-  - skip:
-        version: " - 5.0.0"
-        reason:  bug fixed in 5.0.1 - dry run was returning just fine even if the index exists
-
   # create index with alias
   - do:
       indices.create:

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml

@@ -43,10 +43,6 @@
 
 ---
 "closed segments test":
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.create:
         index: index1

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml

@@ -1,9 +1,5 @@
 ---
 "Shrink index ignores target template mapping":
-    - skip:
-        version: " - 5.99.99"
-        reason: bug fixed in 5.6.0
-
     - do:
         cluster.state: {}
         # Get master node id

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/10_basic.yml

@@ -1,10 +1,6 @@
 ---
 "Index Sort":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new feature that has been added in 6.0.0
-
   - do:
       indices.create:
         index: test

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml

@@ -102,9 +102,6 @@ setup:
 
 ---
 "Indices stats unrecognized parameter":
-  - skip:
-      version: " - 5.0.99"
-      reason: strict stats handling does not exist in 5.0
   - do:
       catch: bad_request
       indices.stats:

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/11_metric.yml

@@ -123,9 +123,6 @@ setup:
 
 ---
 "Metric - _all include_segment_file_sizes":
-  - skip:
-        version: " - 5.1.1"
-        reason: including segment file sizes triggered an unrecognized parameter in <= 5.1.1
   - do:
       indices.stats: { metric: _all, include_segment_file_sizes: true }
 
@@ -148,9 +145,6 @@ setup:
 
 ---
 "Metric - segments include_segment_file_sizes":
-  - skip:
-      version: " - 5.1.1"
-      reason: including segment file sizes triggered an unrecognized parameter in <= 5.1.1
   - do:
       indices.stats: { metric: segments, include_segment_file_sizes: true }
 

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/20_translog.yml

@@ -9,9 +9,6 @@ setup:
 
 ---
 "Translog retention":
-  - skip:
-      version: " - 5.99.0"
-      reason: translog retention was added in 6.0.0
   - do:
       indices.stats:
         metric: [ translog ]

+ 0 - 16
rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/10_basic.yml

@@ -18,10 +18,6 @@
 
 ---
 "Upgrade indices ignore unavailable":
-  - skip:
-      version: " - 5.0.0"
-      reason: ignore_unavailable was added as a bugfix in 5.0.1 see #21281
-
   - do:
       indices.create:
         index: test_index
@@ -43,10 +39,6 @@
 ---
 "Upgrade indices allow no indices":
 
-  - skip:
-      version: " - 5.0.0"
-      reason: ignore_unavailable was added as a bugfix in 5.0.1 see #21281
-
   - do:
       indices.upgrade:
         index: test_index
@@ -58,10 +50,6 @@
 ---
 "Upgrade indices disallow no indices":
 
-  - skip:
-      version: " - 5.0.0"
-      reason: ignore_unavailable was added as a bugfix in 5.0.1 see #21281
-
   - do:
       catch: missing
       indices.upgrade:
@@ -72,10 +60,6 @@
 ---
 "Upgrade indices disallow unavailable":
 
-  - skip:
-      version: " - 5.0.0"
-      reason: ignore_unavailable was added as a bugfix in 5.0.1 see #21281
-
   - do:
       indices.create:
         index: test_index

+ 4 - 9
rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml

@@ -1,10 +1,5 @@
 ---
 "IDs":
-  - skip:
-        # this will only run in a mixed cluster environment with at least 1 5.x node
-        version: "5.99.99 - "
-        reason:  multiple types are not supported on 6.x indices onwards
-
   - do:
         indices.create:
           index: test_1
@@ -19,7 +14,7 @@
   - do:
       index:
           index:  test_1
-          type:   test_2
+          type:   test
           id:     2
           body:   { foo: baz }
 
@@ -28,7 +23,7 @@
         index:  test_1
         type:   test
         body:
-          ids: [1, 2]
+          ids: [1, 3]
 
   - is_true:  docs.0.found
   - match:  { docs.0._index:     test_1      }
@@ -40,7 +35,7 @@
   - is_false: docs.1.found
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      test        }
-  - match:  { docs.1._id:        "2"         }
+  - match:  { docs.1._id:        "3"         }
 
   - do:
       mget:
@@ -57,7 +52,7 @@
 
   - is_true:  docs.1.found
   - match:  { docs.1._index:     test_1      }
-  - match:  { docs.1._type:      test_2      }
+  - match:  { docs.1._type:      test      }
   - match:  { docs.1._id:        "2"         }
   - match:  { docs.1._version:   1           }
   - match:  { docs.1._source:    { foo: baz }}

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/msearch/20_typed_keys.yml

@@ -1,9 +1,5 @@
 ---
 setup:
-  - skip:
-      version: " - 5.3.99"
-      reason: typed_keys parameter was added in 5.4.0
-
   - do:
       indices.create:
         index: test-0

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml

@@ -23,9 +23,6 @@
 
 ---
 "Nodes stats unrecognized parameter":
-  - skip:
-      version: " - 5.0.99"
-      reason: strict stats handling does not exist in 5.0
   - do:
       catch: bad_request
       nodes.stats:

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml

@@ -157,9 +157,6 @@
 
 ---
 "Metric - _all include_segment_file_sizes":
-  - skip:
-      version: " - 5.1.1"
-      reason: including segment file sizes triggered an unrecognized parameter in <= 5.1.1
   - do:
       cluster.state: {}
 
@@ -187,9 +184,6 @@
 
 ---
 "Metric - segments include_segment_file_sizes":
-  - skip:
-      version: " - 5.1.1"
-      reason: including segment file sizes triggered an unrecognized parameter in <= 5.1.1
   - do:
       cluster.state: {}
 

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/scroll/11_clear.yml

@@ -79,10 +79,6 @@
 
 ---
 "Body params with string param scroll id override query string":
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new API that has been added in 6.0
-
   - do:
       indices.create:
           index:  test_scroll

+ 0 - 1
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml

@@ -150,7 +150,6 @@ setup:
 "Deprecated _time order":
 
   - skip:
-      version: " - 5.99.99"
       reason:  _time order deprecated in 6.0, replaced by _key
       features: "warnings"
 

+ 0 - 33
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml

@@ -370,10 +370,6 @@ setup:
 ---
 "Partitioned string test":
 
-  - skip:
-      version: " - 5.1.99"
-      reason:  Partitioning is a 5.2.0 feature
-
   - do:
       index:
         index: test_1
@@ -429,10 +425,6 @@ setup:
 ---
 "Partitioned integer test":
 
-  - skip:
-      version: " - 5.1.99"
-      reason:  Partitioning is a 5.2.0 feature
-
   - do:
       index:
         index: test_1
@@ -484,10 +476,6 @@ setup:
 ---
 "Unmapped strings":
 
-  - skip:
-      version: " - 5.1.99"
-      reason: Unmapped fields handling with value_type was added in 5.2
-
   - do:
       index:
         index: test_1
@@ -513,10 +501,6 @@ setup:
 ---
 "Unmapped booleans":
 
-  - skip:
-      version: " - 5.1.99"
-      reason: Unmapped fields handling with value_type was added in 5.2
-
   - do:
       index:
         index: test_1
@@ -544,10 +528,6 @@ setup:
 ---
 "Unmapped dates":
 
-  - skip:
-      version: " - 5.1.99"
-      reason: Unmapped fields handling with value_type was added in 5.2
-
   - do:
       index:
         index: test_1
@@ -575,10 +555,6 @@ setup:
 ---
 "Unmapped longs":
 
-  - skip:
-      version: " - 5.1.99"
-      reason: Unmapped fields handling with value_type was added in 5.2
-
   - do:
       index:
         index: test_1
@@ -604,10 +580,6 @@ setup:
 ---
 "Unmapped doubles":
 
-  - skip:
-      version: " - 5.1.99"
-      reason: Unmapped fields handling with value_type was added in 5.2
-
   - do:
       index:
         index: test_1
@@ -633,10 +605,6 @@ setup:
 ---
 "Mixing longs and doubles":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  in 6.0 longs and doubles are compatible within a terms agg (longs are promoted to doubles)
-
   - do:
       index:
         index: test_1
@@ -699,7 +667,6 @@ setup:
 "Deprecated _term order":
 
   - skip:
-      version: " - 5.99.99"
       reason:  _term order deprecated in 6.0, replaced by _key
       features: "warnings"
 

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml

@@ -112,9 +112,6 @@ setup:
 
 ---
 "IP range":
-  - skip:
-      version: " - 5.1.1"
-      reason: IP range queries had an exclusive range bug prior to 5.1.2
   - do:
       index:
         index: test
@@ -228,9 +225,6 @@ setup:
 
 ---
 "Date range":
-  - skip:
-      version: " - 5.99.99"
-      reason: before 6.0, numeric date_range to/from parameters were always parsed as if they are epoch_millis (#17920)
   - do:
       index:
         index: test

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml

@@ -34,10 +34,6 @@ setup:
 ---
 "Filter aggs with terms lookup and ensure it's cached":
   # Because the filter agg rewrites the terms lookup in the rewrite phase the request can be cached
-  - skip:
-      version: " - 5.99.99"
-      reason:  This using filter aggs that are rewritten, this was added in 6.0.0
-
   - do:
       search:
         size: 0

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/70_adjacency_matrix.yml

@@ -40,10 +40,6 @@ setup:
 ---
 "Filters intersections":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  Adjacency Matrix is a 5.3.0 feature
-      
   - do:
       search:
         body: { "size": 0, "aggs": { "conns": { "adjacency_matrix": {  "filters": { "1": { "term": { "num": 1 } }, "2": { "term": { "num": 2 } }, "4": { "term": { "num": 4 } } } } } } }

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml

@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: " - 5.3.99"
-      reason: typed_keys parameter was added in 5.4.0
 
   - do:
       indices.create:

+ 0 - 8
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text.yml

@@ -1,10 +1,6 @@
 ---
 "Default index":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new feature that has been added in 6.0.0
-
   - do:
       indices.create:
           index:  goodbad
@@ -86,10 +82,6 @@
 ---
 "Dedup noise":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new feature that has been added in 6.0.0
-
   - do:
       indices.create:
           index:  goodbad

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/10_unified.yml

@@ -27,9 +27,6 @@ setup:
 
 ---
 "Basic":
-  - skip:
-      version: " - 5.99.99"
-      reason:  this uses a new highlighter that has been added in 5.3
   - do:
       search:
         body: { "query" : {"multi_match" : { "query" : "quick brown fox", "fields" : [ "text*"] } }, "highlight" : { "type" : "unified", "fields" : { "*" : {} } } }

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/20_fvh.yml

@@ -25,9 +25,6 @@ setup:
 
 ---
 "Highlight query":
-  - skip:
-      version: " - 5.5.99"
-      reason:  bug fixed in 5.6
   - do:
       search:
         body:

+ 0 - 36
rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml

@@ -57,10 +57,6 @@ setup:
 ---
 "field collapsing":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       search:
         index: test
@@ -92,10 +88,6 @@ setup:
 ---
 "field collapsing and from":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       search:
         index: test
@@ -116,10 +108,6 @@ setup:
 ---
 "field collapsing and inner_hits":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       search:
         index: test
@@ -159,10 +147,6 @@ setup:
 ---
 "field collapsing, inner_hits and maxConcurrentGroupRequests":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       search:
         index: test
@@ -203,10 +187,6 @@ setup:
 ---
 "field collapsing and scroll":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       catch:      /cannot use \`collapse\` in a scroll context/
       search:
@@ -218,10 +198,6 @@ setup:
 ---
 "field collapsing and search_after":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       catch:      /cannot use \`collapse\` in conjunction with \`search_after\`/
       search:
@@ -234,10 +210,6 @@ setup:
 ---
 "field collapsing and rescore":
 
-  - skip:
-      version: " - 5.2.99"
-      reason:  this uses a new API that has been added in 5.3
-
   - do:
       catch:      /cannot use \`collapse\` in conjunction with \`rescore\`/
       search:
@@ -255,10 +227,6 @@ setup:
 ---
 "no hits and inner_hits":
 
-  - skip:
-      version: " - 5.4.0"
-      reason:  "bug fixed in 5.4.1"
-
   - do:
       search:
         index: test
@@ -273,10 +241,6 @@ setup:
 ---
 "field collapsing and multiple inner_hits":
 
-  - skip:
-      version: " - 5.4.99"
-      reason:  Multiple inner_hits is a new feature added in 5.5
-
   - do:
       search:
         index: test

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/search/120_batch_reduce_size.yml

@@ -14,9 +14,6 @@ setup:
 
 ---
 "batched_reduce_size lower limit":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this was added in 5.4.0
   - do:
       catch:      /batchedReduceSize must be >= 2/
       search:
@@ -26,9 +23,6 @@ setup:
 
 ---
 "batched_reduce_size 2 with 5 shards":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this was added in 5.4.0
   - do:
       index:
         index: test_1

+ 0 - 6
rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml

@@ -39,9 +39,6 @@ setup:
 
 ---
 "pre_filter_shard_size with invalid parameter":
-  - skip:
-      version: " - 5.5.99"
-      reason:  this was added in 5.6.0
   - do:
       catch: /preFilterShardSize must be >= 1/
       search:
@@ -50,9 +47,6 @@ setup:
 
 ---
 "pre_filter_shard_size with shards that have no hit":
-  - skip:
-      version: " - 5.5.99"
-      reason:  this was added in 5.6.0
   - do:
       index:
         index: index_1

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/search/150_rewrite_on_coordinator.yml

@@ -1,8 +1,4 @@
 "Ensure that we fetch the document only once":
-  - skip:
-      version: " - 5.99.99"
-      reason:  this was added in 6.0.0
-
   - do:
       indices.create:
           index: search_index

+ 0 - 21
rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml

@@ -37,7 +37,6 @@ setup:
 ---
 "Indices boost using object":
   - skip:
-      version: " - 5.1.99"
       reason: deprecation was added in 5.2.0
       features: "warnings"
 
@@ -67,10 +66,6 @@ setup:
 
 ---
 "Indices boost using array":
-  - skip:
-      version: " - 5.1.99"
-      reason: array format was added in 5.2.0
-
   - do:
       search:
         index: _all
@@ -93,10 +88,6 @@ setup:
 
 ---
 "Indices boost using array with alias":
-  - skip:
-      version: " - 5.1.99"
-      reason: array format was added in 5.2.0
-
   - do:
       search:
         index: _all
@@ -119,10 +110,6 @@ setup:
 
 ---
 "Indices boost using array with wildcard":
-  - skip:
-      version: " - 5.1.99"
-      reason: array format was added in 5.2.0
-
   - do:
       search:
         index: _all
@@ -145,10 +132,6 @@ setup:
 
 ---
 "Indices boost using array multiple match":
-  - skip:
-      version: " - 5.1.99"
-      reason: array format was added in 5.2.0
-
   - do:
       search:
         index: _all
@@ -173,10 +156,6 @@ setup:
 
 ---
 "Indices boost for nonexistent index/alias":
-  - skip:
-      version: " - 5.1.99"
-      reason: array format was added in 5.2.0
-
   - do:
       catch: /no such index/
       search:

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/search/90_search_after.yml

@@ -30,9 +30,6 @@ setup:
 ---
 "search with search_after parameter":
 
-  - skip:
-      version: " - 5.99.99"
-      reason: fielddata on _id is only available as of 6.0.0
   - do:
       search:
         index: test

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic.yml

@@ -13,10 +13,6 @@
 
 ---
 "Search shards aliases with and without filters":
-  - skip:
-      version: " - 5.4.0"
-      reason: "#24489 fixed a bug that not all aliases where added in 5.4.1 - indices section was added in 5.1.0"
-
   - do:
       indices.create:
         index: test_index

+ 0 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml

@@ -61,10 +61,6 @@ setup:
 
 ---
 "Get snapshot info when verbose is false":
-  - skip:
-      version: " - 5.99.99"
-      reason: verbose mode was introduced in 6.0
-
   - do:
       indices.create:
         index: test_index

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/suggest/40_typed_keys.yml

@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: " - 5.3.99"
-      reason: typed_keys parameter was added in 5.4.0
 
   - do:
       indices.create:

+ 0 - 3
rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/10_basic.yml

@@ -1,8 +1,5 @@
 ---
 "get task test":
-  - skip:
-      version: " - 5.1.99"
-      reason: massage was changed in 5.2.0
   # Note that this gets much better testing in reindex's tests because it actually saves the task
   - do:
       cluster.state: {}

+ 0 - 4
x-pack/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml

@@ -39,10 +39,6 @@ teardown:
         ignore: 404
 ---
 "Get simple field caps from remote cluster":
-  - skip:
-      version: " - 5.4.99"
-      reason:  this uses a new API that has been added in 5.5.0
-
   - do:
         indices.create:
           index: field_caps_index_2

+ 0 - 3
x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/20_security.yml

@@ -31,9 +31,6 @@
 
 ---
 "verify users for default password migration in mixed cluster":
-  - skip:
-      version: " - 5.1.1"
-      reason: "the rest enabled action used by the old cluster test trips an assertion. see https://github.com/elastic/x-pack/pull/4443"
   - do:
       xpack.security.get_user:
         username: "kibana,logstash_system"