From 1f5e04b721e8835c01bc2f951818e1415f046eef Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Thu, 11 Apr 2024 18:22:38 +0200 Subject: [PATCH] Migrate YAML REST tests to synthetic cluster feature check (#107068) To simplify the migration away from version based skip checks in YAML specs, this PR adds a synthetic version feature `gte_vX.Y.Z` for any version at or before 8.14.0. New test specs for 8.14 or later are expected to use respective new cluster features, or a test-only feature supplied via ESRestTestCase#createAdditionalFeatureSpecifications if sufficient. --- .../test/aggregations/adjacency_matrix.yml | 4 +- .../test/aggregations/auto_date_histogram.yml | 12 +-- .../test/aggregations/cardinality_metric.yml | 36 +++---- .../test/aggregations/composite.yml | 96 +++++++++---------- .../aggregations/date_agg_per_day_of_week.yml | 4 +- .../test/aggregations/date_histogram.yml | 36 +++---- .../test/aggregations/date_range.yml | 4 +- .../test/aggregations/doc_count_field.yml | 32 +++---- .../test/aggregations/filter.yml | 4 +- .../test/aggregations/filters_bucket.yml | 28 +++--- .../test/aggregations/geo_distance.yml | 4 +- .../test/aggregations/global.yml | 4 +- .../test/aggregations/histogram.yml | 44 ++++----- .../test/aggregations/ip_prefix.yml | 56 +++++------ .../test/aggregations/ip_range.yml | 4 +- .../matrix_stats_multi_value_field.yml | 4 +- .../test/aggregations/max_metric.yml | 8 +- .../median_absolute_deviation_metric.yml | 4 +- .../test/aggregations/min_metric.yml | 4 +- .../test/aggregations/moving_fn.yml | 4 +- .../percentile_ranks_tdigest_metric.yml | 12 +-- .../percentiles_tdigest_metric.yml | 10 +- .../test/aggregations/pipeline.yml | 22 ++--- .../test/aggregations/random_sampler.yml | 14 +-- .../rest-api-spec/test/aggregations/range.yml | 28 +++--- .../test/aggregations/range_timezone_bug.yml | 8 +- .../test/aggregations/rare_terms.yml | 12 +-- .../test/aggregations/serial_diff.yml | 4 +- .../test/aggregations/sig_terms.yml | 12 +-- .../test/aggregations/significant_text.yml | 4 +- .../test/aggregations/significant_texts.yml | 20 ++-- .../rest-api-spec/test/aggregations/terms.yml | 52 +++++----- .../test/aggregations/terms_disable_opt.yml | 12 +-- .../aggregations/terms_flattened_field.yml | 20 ++-- .../test/aggregations/time_series.yml | 60 ++++++------ .../test/aggregations/top_hits.yml | 12 +-- .../aggregations/top_hits_nested_metric.yml | 4 +- .../test/aggregations/typed_keys.yml | 4 +- .../aggregations/variable_width_histogram.yml | 16 ++-- .../test/aggregations/weighted_avg.yml | 6 +- .../test/cluster.stats/10_analysis_stats.yml | 4 +- .../20_analysis_stats_synonyms.yml | 4 +- .../test/search.query/70_intervals.yml | 4 +- .../test/data_stream/100_delete_by_query.yml | 12 +-- .../test/data_stream/10_basic.yml | 78 +++++++-------- .../test/data_stream/110_update_by_query.yml | 12 +-- .../data_stream/120_data_streams_stats.yml | 20 ++-- .../130_migrate_to_data_stream.yml | 6 +- .../data_stream/140_data_stream_aliases.yml | 30 +++--- .../test/data_stream/150_tsdb.yml | 42 ++++---- .../data_stream/170_modify_data_stream.yml | 6 +- .../180_simulate_existing_data_stream.yml | 6 +- .../190_failure_store_redirection.yml | 12 +-- .../data_stream/190_require_data_stream.yml | 12 +-- .../200_rollover_failure_store.yml | 6 +- .../test/data_stream/20_unsupported_apis.yml | 30 +++--- .../30_auto_create_data_stream.yml | 12 +-- .../test/data_stream/40_supported_apis.yml | 38 ++++---- .../data_stream/50_delete_backing_indices.yml | 8 +- .../data_stream/60_get_backing_indices.yml | 6 +- .../data_stream/70_rollover_data_streams.yml | 6 +- .../80_resolve_index_data_streams.yml | 14 +-- .../test/data_stream/90_reindex.yml | 24 ++--- .../190_create_data_stream_with_lifecycle.yml | 6 +- .../ingest_attachment/30_files_supported.yml | 8 +- .../test/ingest/15_info_ingest.yml | 4 +- .../test/ingest/190_script_processor.yml | 4 +- .../test/ingest/210_pipeline_processor.yml | 4 +- .../test/ingest/290_versioned_update.yml | 4 +- .../rest-api-spec/test/ingest/70_bulk.yml | 4 +- .../test/lang_mustache/30_search_template.yml | 4 +- .../50_multi_search_template.yml | 18 ++-- .../test/painless/110_script_score_boost.yml | 4 +- .../painless/145_dense_vector_byte_basic.yml | 6 +- .../painless/155_dense_vector_byte_l1l2.yml | 6 +- .../rest-api-spec/test/painless/15_update.yml | 8 +- .../160_dense_vector_special_cases.yml | 4 +- .../165_dense_vector_byte_special_cases.yml | 10 +- .../170_dense_vector_script_access.yml | 4 +- .../175_dense_vector_byte_script_access.yml | 4 +- .../test/painless/17_update_error.yml | 4 +- .../180_knn_and_binary_dv_fields_api.yml | 36 +++---- .../185_knn_and_binary_byte_dv_fields_api.yml | 4 +- .../test/painless/25_script_upsert.yml | 8 +- .../test/painless/80_script_score.yml | 4 +- .../painless/85_script_score_random_score.yml | 4 +- .../test/match_only_text/10_basic.yml | 16 ++-- .../test/rank_feature/20_null_value.yml | 8 +- .../test/search-as-you-type/10_basic.yml | 4 +- .../search-as-you-type/20_highlighting.yml | 4 +- .../rest-api-spec/test/11_parent_child.yml | 8 +- .../rest-api-spec/test/20_parent_join.yml | 18 ++-- .../rest-api-spec/test/30_inner_hits.yml | 16 ++-- .../rest-api-spec/test/50_order_by.yml | 6 +- .../test/60_synthetic_source.yml | 4 +- .../rest-api-spec/test/20_matched_queries.yml | 4 +- .../test/delete_by_query/10_basic.yml | 16 ++-- .../test/delete_by_query/20_validation.yml | 8 +- .../test/delete_by_query/40_versioning.yml | 2 +- .../rest-api-spec/test/reindex/100_tsdb.yml | 34 +++---- .../test/reindex/110_synthetic_source.yml | 8 +- .../test/reindex/20_validation.yml | 20 ++-- .../rest-api-spec/test/reindex/30_search.yml | 18 ++-- .../test/reindex/85_scripting.yml | 4 +- .../rest-api-spec/test/reindex/90_remote.yml | 4 +- .../test/update_by_query/10_basic.yml | 12 +-- .../test/update_by_query/20_validation.yml | 16 ++-- .../test/update_by_query/40_versioning.yml | 2 +- .../test/update_by_query/80_scripting.yml | 20 ++-- .../test/update_by_query/90_tsdb.yml | 4 +- .../test/runtime_fields/10_keyword.yml | 4 +- .../test/runtime_fields/110_composite.yml | 4 +- .../runtime_fields/270_synthetic_source.yml | 8 +- .../runtime_fields/40_runtime_mappings.yml | 12 +-- .../test/mapper_annotatedtext/10_basic.yml | 4 +- .../rest/yaml/CcsCommonYamlTestSuiteIT.java | 17 +--- .../yaml/RcsCcsCommonYamlTestSuiteIT.java | 16 +--- ...rameterizedFullClusterRestartTestCase.java | 20 ++-- .../test/multi_cluster/100_tsdb.yml | 12 +-- .../test/multi_cluster/30_field_caps.yml | 8 +- .../test/remote_cluster/10_basic.yml | 4 +- .../old_cluster/20_camel_case_on_format.yml | 11 ++- .../ParameterizedRollingUpgradeTestCase.java | 13 +-- .../20_tsdb_consistency.yml | 12 +-- .../30_desired_balance.yml | 24 ++--- .../rest-api-spec/test/bulk/12_noop.yml | 4 +- .../test/cat.allocation/10_basic.yml | 28 +++--- .../test/cat.templates/20_matching.yml | 4 +- .../test/cluster.desired_nodes/10_basic.yml | 4 +- .../cluster.desired_nodes/11_old_format.yml | 15 +-- .../test/cluster.desired_nodes/20_dry_run.yml | 12 +-- .../rest-api-spec/test/delete/70_tsdb.yml | 4 +- .../test/features.get_features/10_basic.yml | 6 +- .../test/features.reset_features/10_basic.yml | 6 +- .../test/field_caps/10_basic.yml | 32 +++---- .../rest-api-spec/test/field_caps/20_meta.yml | 4 +- .../test/field_caps/30_index_filter.yml | 4 +- .../test/field_caps/40_time_series.yml | 8 +- .../test/field_caps/60_non_empty_fields.yml | 4 +- .../test/get/100_synthetic_source.yml | 64 ++++++------- .../test/get/110_ignore_malformed.yml | 4 +- .../test/index/70_require_alias.yml | 4 +- .../test/index/80_date_nanos.yml | 4 +- .../rest-api-spec/test/index/90_geo_point.yml | 4 +- .../test/index/91_metrics_no_subobjects.yml | 24 ++--- .../test/indices.blocks/10_basic.yml | 4 +- .../test/indices.clone/10_basic.yml | 8 +- .../test/indices.clone/20_source_mapping.yml | 4 +- .../test/indices.clone/30_copy_settings.yml | 6 +- .../test/indices.create/10_basic.yml | 4 +- .../indices.create/20_synthetic_source.yml | 8 +- .../indices.create/30_dynamic_template.yml | 8 +- .../test/indices.flush/10_basic.yml | 4 +- .../test/indices.forcemerge/10_basic.yml | 8 +- .../test/indices.get/10_basic.yml | 4 +- .../indices.get_field_mapping/10_basic.yml | 6 +- .../indices.get_index_template/10_basic.yml | 4 +- .../20_get_missing.yml | 16 ++-- .../50_wildcard_expansion.yml | 4 +- .../test/indices.open/10_basic.yml | 10 +- .../test/indices.put_alias/10_basic.yml | 4 +- .../indices.put_index_template/10_basic.yml | 28 +++--- .../15_composition.yml | 42 ++++---- .../test/indices.recovery/10_basic.yml | 10 +- .../10_basic_resolve_cluster.yml | 26 ++--- .../20_resolve_system_index.yml | 6 +- .../10_basic_resolve_index.yml | 14 +-- .../20_resolve_system_index.yml | 6 +- .../test/indices.rollover/10_basic.yml | 4 +- .../25_max_shard_doc_condition.yml | 4 +- .../35_max_primary_shard_size_condition.yml | 4 +- .../indices.rollover/50_min_age_condition.yml | 4 +- .../55_min_docs_condition.yml | 4 +- .../60_min_primary_shard_docs_condition.yml | 4 +- .../65_min_primary_shard_size_condition.yml | 4 +- .../70_min_size_condition.yml | 4 +- .../10_basic.yml | 36 +++---- .../indices.simulate_template/10_basic.yml | 30 +++--- .../test/indices.split/10_basic.yml | 4 +- .../indices.split/50_routing_required.yml | 4 +- .../test/indices.stats/100_search_idle.yml | 4 +- .../test/indices.stats/20_translog.yml | 4 +- .../test/indices.stats/30_segments.yml | 8 +- .../test/indices.stats/50_disk_usage.yml | 12 +-- .../test/indices.stats/70_write_load.yml | 4 +- .../test/indices.stats/90_global_ordinals.yml | 16 ++-- .../test/indices.update_aliases/10_basic.yml | 4 +- .../indices.update_aliases/40_must_exist.yml | 4 +- .../rest-api-spec/test/ingest/10_basic.yml | 4 +- .../mget/14_alias_to_multiple_indices.yml | 4 +- .../rest-api-spec/test/mget/40_routing.yml | 4 +- .../test/mget/90_synthetic_source.yml | 16 ++-- .../10_get_feature_upgrade_status.yml | 4 +- .../migration/20_post_feature_upgrade.yml | 4 +- .../test/mtermvectors/30_routing.yml | 4 +- .../test/nodes.info/10_basic.yml | 6 +- .../rest-api-spec/test/nodes.info/40_aggs.yml | 6 +- .../nodes.reload_secure_settings/10_basic.yml | 4 +- .../test/nodes.stats/11_indices_metrics.yml | 54 +++++------ .../test/nodes.stats/40_store_stats.yml | 6 +- .../test/nodes.stats/50_indexing_pressure.yml | 12 +-- .../test/nodes.stats/60_transport_stats.yml | 6 +- .../70_repository_throttling_stats.yml | 12 +-- .../test/nodes.stats/80_allocation_stats.yml | 6 +- .../rest-api-spec/test/range/10_basic.yml | 4 +- .../test/scripts/20_get_script_context.yml | 4 +- .../test/scripts/25_get_script_languages.yml | 4 +- .../test/search.highlight/10_unified.yml | 12 +-- .../test/search.highlight/20_fvh.yml | 8 +- .../30_max_analyzed_offset.yml | 16 ++-- .../search.highlight/40_keyword_ignore.yml | 8 +- .../search.highlight/50_synthetic_source.yml | 44 ++++----- .../70_dense_vector_telemetry.yml | 4 +- .../test/search.vectors/90_sparse_vector.yml | 14 ++- .../test/search/110_field_collapsing.yml | 4 +- .../111_field_collapsing_with_max_score.yml | 6 +- .../161_exists_query_within_nested_query.yml | 60 ++++++------ .../test/search/200_ignore_malformed.yml | 4 +- .../test/search/220_total_hits_object.yml | 4 +- .../test/search/230_interval_query.yml | 24 ++--- .../test/search/240_date_nanos.yml | 4 +- .../test/search/250_distance_feature.yml | 4 +- .../rest-api-spec/test/search/30_limits.yml | 8 +- .../test/search/310_match_bool_prefix.yml | 4 +- .../test/search/320_disallow_queries.yml | 12 +-- .../test/search/330_fetch_fields.yml | 8 +- .../test/search/340_flattened.yml | 8 +- .../test/search/350_binary_field.yml | 6 +- .../test/search/350_point_in_time.yml | 20 ++-- .../test/search/360_combined_fields.yml | 4 +- .../rest-api-spec/test/search/370_profile.yml | 6 +- .../search/380_sort_segments_on_timestamp.yml | 12 +-- .../test/search/390_doc_values_search.yml | 16 ++-- .../test/search/390_lookup_fields.yml | 8 +- .../test/search/400_synthetic_source.yml | 40 ++++---- .../test/search/410_named_queries.yml | 8 +- .../test/search/500_date_range.yml | 4 +- .../search/510_range_query_out_of_bounds.yml | 4 +- .../test/search/90_search_after.yml | 14 +-- .../test/snapshot.clone/10_basic.yml | 4 +- .../test/snapshot.create/10_basic.yml | 4 +- .../test/snapshot.get/10_basic.yml | 16 ++-- .../20_repository_uuid.yml | 4 +- .../synonyms/100_synonyms_no_system_index.yml | 4 +- .../test/synonyms/10_synonyms_put.yml | 4 +- .../test/synonyms/20_synonyms_get.yml | 4 +- .../test/synonyms/30_synonyms_delete.yml | 4 +- .../test/synonyms/40_synonyms_sets_get.yml | 4 +- .../test/synonyms/50_synonym_rule_put.yml | 4 +- .../test/synonyms/60_synonym_rule_get.yml | 4 +- .../test/synonyms/70_synonym_rule_delete.yml | 4 +- .../test/synonyms/80_synonyms_from_index.yml | 4 +- .../90_synonyms_reloading_for_synset.yml | 4 +- ...dimension_and_metric_in_non_tsdb_index.yml | 20 ++-- .../rest-api-spec/test/tsdb/100_composite.yml | 8 +- .../rest-api-spec/test/tsdb/10_settings.yml | 76 +++++++-------- .../test/tsdb/110_field_caps.yml | 12 +-- .../test/tsdb/120_counter_fields.yml | 6 +- .../test/tsdb/130_position_fields.yml | 62 ++++++------ .../test/tsdb/140_routing_path.yml | 16 ++-- .../test/tsdb/150_runtime_fields.yml | 4 +- .../test/tsdb/15_timestamp_mapping.yml | 40 ++++---- .../rest-api-spec/test/tsdb/20_mapping.yml | 62 ++++++------ .../rest-api-spec/test/tsdb/30_snapshot.yml | 10 +- .../rest-api-spec/test/tsdb/40_search.yml | 52 +++++----- .../rest-api-spec/test/tsdb/50_alias.yml | 8 +- .../test/tsdb/60_add_dimensions.yml | 20 ++-- .../test/tsdb/70_dimension_types.yml | 46 ++++----- .../test/tsdb/80_index_resize.yml | 12 +-- .../test/tsdb/90_unsupported_operations.yml | 44 ++++----- .../test/update/100_synthetic_source.yml | 8 +- .../rest-api-spec/test/update/90_error.yml | 4 +- .../test/update/95_require_alias.yml | 4 +- .../10_basic_compat.yml | 6 +- .../10_basic_upgrade.yml | 12 +-- .../indices.put_template/10_basic_compat.yml | 6 +- .../nodes.hot_threads/10_basic_compat.yml | 6 +- .../test/search.aggregation/10_moving_avg.yml | 6 +- .../test/search/10_cutoff_frequency.yml | 6 +- .../test/search/10_geo_bounding_box.yml | 6 +- .../test/error_query/20_stall_time.yml | 4 +- .../test/rest/ESRestTestCase.java | 15 +-- .../test/rest/ESRestTestFeatureService.java | 53 +++++++--- .../test/rest/TestFeatureService.java | 6 +- .../ClientYamlTestExecutionContextTests.java | 16 +--- .../rest-api-spec/test/ccr/auto_follow.yml | 12 +-- .../test/downsample/10_basic.yml | 8 +- .../test/downsample/10_basic.yml | 82 ++++++++-------- .../test/downsample/20_unsupported_aggs.yml | 24 ++--- .../test/downsample/30_date_histogram.yml | 22 ++--- .../test/downsample/40_runtime_fields.yml | 14 +-- .../downsample/50_auto_date_histogram.yml | 4 +- .../test/downsample/60_settings.yml | 10 +- .../test/downsample/10_basic.yml | 8 +- .../199_query_rulesets_before_setup.yml | 6 +- .../test/entsearch/200_query_ruleset_put.yml | 4 +- .../test/entsearch/225_query_ruleset_list.yml | 4 +- .../entsearch/250_query_ruleset_delete.yml | 4 +- .../test/entsearch/260_rule_query_search.yml | 16 ++-- .../test/entsearch/300_connector_put.yml | 4 +- .../test/entsearch/305_connector_post.yml | 4 +- .../test/entsearch/310_connector_list.yml | 4 +- .../test/entsearch/320_connector_delete.yml | 4 +- .../330_connector_update_pipeline.yml | 4 +- .../331_connector_update_scheduling.yml | 4 +- .../332_connector_update_filtering.yml | 4 +- .../test/entsearch/333_connector_check_in.yml | 6 +- .../334_connector_update_last_sync_stats.yml | 4 +- .../335_connector_update_configuration.yml | 4 +- .../entsearch/335_connector_update_error.yml | 4 +- .../entsearch/336_connector_update_name.yml | 4 +- .../337_connector_update_service_type.yml | 4 +- .../338_connector_update_index_name.yml | 4 +- .../entsearch/339_connector_update_native.yml | 4 +- .../entsearch/340_connector_update_status.yml | 4 +- .../341_connector_update_api_key_id.yml | 4 +- .../entsearch/400_connector_sync_job_post.yml | 4 +- .../410_connector_sync_job_delete.yml | 4 +- .../420_connector_sync_job_check_in.yml | 6 +- .../430_connector_sync_job_cancel.yml | 4 +- .../entsearch/440_connector_sync_job_get.yml | 4 +- .../450_connector_sync_job_error.yml | 4 +- .../460_connector_sync_job_update_stats.yml | 4 +- .../entsearch/470_connector_sync_job_list.yml | 4 +- .../entsearch/500_connector_secret_post.yml | 4 +- .../entsearch/505_connector_secret_put.yml | 4 +- .../entsearch/510_connector_secret_get.yml | 4 +- .../entsearch/520_connector_secret_delete.yml | 4 +- .../esql/qa/mixed/MixedClusterEsqlSpecIT.java | 18 ++-- .../test/ilm/70_downsampling.yml | 12 +-- .../test/20_synthetic_source.yml | 4 +- .../resources/rest-api-spec/test/10_basic.yml | 14 +-- .../rest-api-spec/test/20_null_value.yml | 4 +- .../rest-api-spec/test/30_multi_fields.yml | 4 +- .../test/40_different_numeric.yml | 4 +- .../rest-api-spec/test/50_script_values.yml | 8 +- .../rest-api-spec/test/60_collapse.yml | 4 +- .../rest-api-spec/test/70_time_series.yml | 24 ++--- .../test/40_synthetic_source.yml | 4 +- .../rest-api-spec/test/50_script_values.yml | 4 +- .../test/60_script_sort_values.yml | 4 +- .../test/multi_cluster/40_text_expansion.yml | 32 +++---- .../test/remote_cluster/40_text_expansion.yml | 32 +++---- .../rest-api-spec/test/clear_cache.yml | 4 +- .../rest-api-spec/test/indices_stats.yml | 4 +- .../resources/rest-api-spec/test/mount.yml | 4 +- .../rest-api-spec/test/repository.yml | 4 +- .../rest-api-spec/test/shared_cache_stats.yml | 4 +- .../resources/rest-api-spec/test/stats.yml | 4 +- .../100_synthetic_source.yml | 4 +- .../test/aggregate-metrics/10_basic.yml | 22 ++--- .../test/aggregate-metrics/110_field_caps.yml | 24 ++--- .../test/aggregate-metrics/20_min_max_agg.yml | 8 +- .../test/aggregate-metrics/30_sum_agg.yml | 8 +- .../test/aggregate-metrics/40_avg_agg.yml | 8 +- .../aggregate-metrics/50_value_count_agg.yml | 8 +- .../80_raw_agg_metric_aggs.yml | 8 +- .../aggregate-metrics/90_tsdb_mappings.yml | 12 +-- .../rest-api-spec/test/analytics/100_tsdb.yml | 12 +-- .../rest-api-spec/test/analytics/boxplot.yml | 6 +- .../test/analytics/histogram.yml | 12 +-- .../test/analytics/matrix_stats.yml | 30 +++--- .../analytics/nested_top_metrics_sort.yml | 64 ++++++------- .../rest-api-spec/test/analytics/rate.yml | 22 ++--- .../test/analytics/reset_tracking_rate.yml | 4 +- .../test/analytics/top_metrics.yml | 4 +- .../rest-api-spec/test/analytics/usage.yml | 4 +- .../test/async_search/10_basic.yml | 4 +- .../async_search/20-with-poin-in-time.yml | 4 +- .../test/constant_keyword/10_basic.yml | 18 ++-- .../test/counted_keyword/10_basic.yml | 4 +- .../test/counted_keyword/20_no_index.yml | 4 +- .../10_data_stream_resolvability.yml | 66 ++++++------- .../test/deprecation/10_basic.yml | 5 +- .../rest-api-spec/test/enrich/10_basic.yml | 6 +- .../rest-api-spec/test/esql/100_bug_fix.yml | 18 ++-- .../rest-api-spec/test/esql/10_basic.yml | 6 +- .../rest-api-spec/test/esql/110_all_null.yml | 4 +- .../rest-api-spec/test/esql/120_profile.yml | 10 +- .../rest-api-spec/test/esql/130_spatial.yml | 6 +- .../rest-api-spec/test/esql/20_aggs.yml | 6 +- .../test/esql/25_aggs_on_null.yml | 6 +- .../rest-api-spec/test/esql/30_types.yml | 30 +++--- .../rest-api-spec/test/esql/40_tsdb.yml | 14 +-- .../test/esql/40_unsupported_types.yml | 14 +-- .../test/esql/45_non_tsdb_counter.yml | 6 +- .../test/esql/50_index_patterns.yml | 6 +- .../rest-api-spec/test/esql/60_enrich.yml | 16 ++-- .../rest-api-spec/test/esql/60_usage.yml | 4 +- .../rest-api-spec/test/esql/61_enrich_ip.yml | 18 ++-- .../test/esql/62_extra_enrich.yml | 8 +- .../rest-api-spec/test/esql/70_locale.yml | 6 +- .../rest-api-spec/test/esql/80_text.yml | 30 +++--- .../test/esql/81_text_exact_subfields.yml | 6 +- .../test/esql/90_non_indexed.yml | 6 +- .../rest-api-spec/test/ml/forecast.yml | 2 +- .../rest-api-spec/test/ml/post_data.yml | 7 +- .../ml/search_knn_query_vector_builder.yml | 8 +- .../test/ml/text_expansion_search.yml | 36 +++---- .../test/privileges/10_basic.yml | 4 +- .../rest-api-spec/test/profiling/10_basic.yml | 4 +- .../rest-api-spec/test/rollup/put_job.yml | 4 +- .../test/rollup/rollup_search.yml | 18 ++-- .../search-business-rules/10_pinned_query.yml | 10 +- .../test/searchable_snapshots/10_usage.yml | 8 +- .../20_synthetic_source.yml | 8 +- .../test/security/authz/14_cat_indices.yml | 4 +- .../test/security/authz/50_data_streams.yml | 44 ++++----- .../security/authz/51_data_stream_aliases.yml | 12 +-- .../test/security/authz/55_auto_configure.yml | 12 +-- .../test/security/authz/60_resolve_index.yml | 12 +-- .../test/security/authz/70_tsdb.yml | 46 ++++----- .../test/security/authz/80_downsample.yml | 30 +++--- .../test/spatial/120_position_geo_line.yml | 4 +- .../test/spatial/70_script_doc_values.yml | 4 +- .../resources/rest-api-spec/test/sql/sql.yml | 6 +- .../test/terms_enum/10_basic.yml | 30 +++--- .../test/terms_enum/20_fieldtypes.yml | 6 +- .../test/versionfield/10_basic.yml | 6 +- .../test/versionfield/20_scripts.yml | 14 +-- .../test/voting_only_node/10_basic.yml | 4 +- .../test/wildcard/10_wildcard_basic.yml | 12 +-- .../10_compat_geo_shape_with_types.yml | 6 +- .../test/freeze.gone/10_basic_compat.yml | 6 +- .../10_synonyms_with_privileges.yml | 6 +- .../20_synonyms_no_privileges.yml | 6 +- .../querying_cluster/100_resolve_index.yml | 4 +- .../querying_cluster/110_resolve_cluster.yml | 4 +- .../test/querying_cluster/80_esql.yml | 4 +- .../test/querying_cluster/10_dls_fls.yml | 4 +- .../mixed_cluster/100_analytics_usage.yml | 10 +- .../test/mixed_cluster/110_enrich.yml | 4 +- .../test/mixed_cluster/120_api_key.yml | 11 ++- .../mixed_cluster/130_operator_privileges.yml | 6 +- .../test/mixed_cluster/140_user_profile.yml | 11 ++- .../test/old_cluster/150_profiling.yml | 4 +- .../test/old_cluster/40_ml_datafeed_crud.yml | 11 ++- .../test/upgraded_cluster/150_profiling.yml | 4 +- .../test/monitoring.bulk/10_basic_compat.yml | 6 +- 439 files changed, 2589 insertions(+), 2622 deletions(-) diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml index 25522264c4dc..439233aab094 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/adjacency_matrix.yml @@ -63,8 +63,8 @@ setup: --- "Terms lookup": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: fixed in 7.9.0 - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml index 792a81e32f5c..25c54bcd7a70 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/auto_date_histogram.yml @@ -25,8 +25,8 @@ setup: --- "basic": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: interval had a in bug before 7.9.0 - do: search: @@ -47,8 +47,8 @@ setup: --- "avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: search: @@ -78,8 +78,8 @@ setup: --- "profile at top level": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml index 8270a8c6b5d7..1c950d387f7a 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/cardinality_metric.yml @@ -243,8 +243,8 @@ setup: --- "profiler int": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: search: @@ -270,8 +270,8 @@ setup: --- "profiler double": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: search: @@ -297,8 +297,8 @@ setup: --- "profiler string": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: introduced in 7.10.0 - do: search: @@ -319,8 +319,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string save memory hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -342,8 +342,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string save time hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -365,8 +365,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string global ords hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -388,8 +388,8 @@ setup: - gt: { profile.shards.0.aggregations.0.breakdown.post_collection: 0 } --- "profiler string segment ords hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -414,8 +414,8 @@ setup: - match: { profile.shards.0.aggregations.0.debug.string_hashing_collectors_used: 0 } --- "profiler string direct hint": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: search: @@ -440,8 +440,8 @@ setup: - gt: { profile.shards.0.aggregations.0.debug.string_hashing_collectors_used: 0 } --- "invalid execution hint throws": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: execution hints introduced in 8.4.0 - do: catch: /Invalid execution mode for cardinality aggregation/ diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml index e480f9636f35..1d56a1a99afe 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/composite.yml @@ -311,8 +311,8 @@ setup: - match: { aggregations.test.buckets.4.doc_count: 1 } --- "Basic numeric histogram": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: Multivalue Handling changed in 8.4 - do: search: @@ -341,8 +341,8 @@ setup: - match: { aggregations.test.buckets.2.doc_count: 1} --- "Basic numeric histogram with missing bucket": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: Multivalue Handling changed in 8.4 - do: search: @@ -374,8 +374,8 @@ setup: - match: { aggregations.test.buckets.3.doc_count: 1} --- "Basic numeric histogram with missing bucket order desc": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: Multivalue Handling changed in 8.4 - do: search: @@ -498,8 +498,8 @@ setup: --- "Composite aggregation with format and calendar_interval": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -559,8 +559,8 @@ setup: --- "Composite aggregation with invalid format": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: After key parse checking added in 7.14 - do: @@ -587,8 +587,8 @@ setup: --- "Composite aggregation with lossy format": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: After key parse checking added in 7.14 - do: @@ -614,8 +614,8 @@ setup: ] --- "Composite aggregation with date_histogram offset": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: offset introduced in 7.6.0 - do: @@ -695,8 +695,8 @@ setup: --- "Composite aggregation with unmapped field": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: starting in 7.2.0 the composite aggregation handles unmapped fields as keywords - do: @@ -776,8 +776,8 @@ setup: --- "Missing source": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: null/empty sources disallowed in 7.2 - do: @@ -805,8 +805,8 @@ setup: --- "Duplicate sources": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: duplicate names disallowed in 7.2 - do: @@ -837,8 +837,8 @@ setup: --- "Simple Composite aggregation with GeoTile grid": - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: geotile_grid is not supported until 7.5.0 - do: search: @@ -881,8 +881,8 @@ setup: --- "Simple Composite aggregation with geotile grid add aggregate after": - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: geotile_grid is not supported until 7.5.0 - do: search: @@ -923,8 +923,8 @@ setup: --- "Mixed ip and unmapped fields": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: This was fixed in 7.6.0 # It is important that the index *without* the ip field be sorted *before* # the index *with* the ip field because that has caused bugs in the past. @@ -969,8 +969,8 @@ setup: --- "date_histogram with time_zone": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: Fixed in 7.6.0 - do: index: @@ -1039,8 +1039,8 @@ setup: "date_histogram with time_zone epoch format": # Same as above, but with a different format. We had a bug about this specifically: # https://github.com/elastic/elasticsearch/issues/68963 - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: Fixed in 7.6.0 - do: index: @@ -1107,8 +1107,8 @@ setup: --- "date_histogram on date_nanos": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: Fixed in 7.7.0 - do: index: @@ -1198,8 +1198,8 @@ setup: --- "Terms source from part of sorted": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: fixed in 7.7.0. - do: @@ -1340,8 +1340,8 @@ setup: --- "Nested then filter then nested then terms": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: Filter support added in 7.13 - do: search: @@ -1384,8 +1384,8 @@ setup: --- "Filter without nesting": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: Filter added in 7.13 - do: search: @@ -1438,8 +1438,8 @@ setup: --- "Simple Composite aggregation with missing_order": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: search: @@ -1465,8 +1465,8 @@ setup: --- "missing_order with missing_bucket = false": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: catch: /missingOrder can only be set if missingBucket is true/ @@ -1489,8 +1489,8 @@ setup: --- "missing_order without missing_bucket": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: catch: /missingOrder can only be set if missingBucket is true/ @@ -1512,8 +1512,8 @@ setup: --- "Nested Composite aggregation with missing_order": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "`missing_order` has been introduced in 7.16" - do: search: @@ -1557,8 +1557,8 @@ setup: --- "date_histogram and date_histogram_composite timezone": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: bug fixed somewhere between 7.2 and 7.17 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml index b7e16109826b..dc349171e3a2 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_agg_per_day_of_week.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "Start of the week Monday was enabled in a backport to 7.7 PR#50916" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml index bb1a2336bce8..b1b9623c8769 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_histogram.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -127,8 +127,8 @@ setup: --- "date_histogram on range with hard bounds": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: hard_bounds introduced in 7.10.0 - do: @@ -156,8 +156,8 @@ setup: --- "date_histogram on date_nanos without timezone fixed interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -186,8 +186,8 @@ setup: --- "date_histogram on date_nanos with timezone fixed interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -216,8 +216,8 @@ setup: --- "date_histogram on date_nanos without timezone calendar interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -246,8 +246,8 @@ setup: --- "date_histogram on date_nanos with timezone calendar interval": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: bug fixed in 7.6.1 - do: search: @@ -276,8 +276,8 @@ setup: --- "date_histogram and date_histogram_composite timezone": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: bug fixed somewhere between 7.2 and 7.17 - do: search: @@ -337,8 +337,8 @@ setup: --- "Multi-value date histogram": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -359,8 +359,8 @@ setup: --- "Multi-value date histogram docvalues only": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml index af78ab3a3677..f8d8f2a379c8 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/date_range.yml @@ -123,8 +123,8 @@ setup: --- "Date range unmapped with children": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: Fixed in 7.10.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml index cbd642d3583d..fec89e6d33e7 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/doc_count_field.yml @@ -30,8 +30,8 @@ setup: --- "Test numeric terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -50,8 +50,8 @@ setup: --- "Test keyword terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -70,8 +70,8 @@ setup: --- "Test unmapped string terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: bulk: @@ -95,8 +95,8 @@ setup: --- "Test composite str_terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -122,8 +122,8 @@ setup: --- "Test composite num_terms agg with doc_count": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "doc_count field has been added in 7.11" - do: search: @@ -149,10 +149,10 @@ setup: --- "Single bucket filters agg with doc_count": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: implementation change in 8.0 - features: default_shards + test_runner_features: default_shards - do: search: @@ -177,10 +177,10 @@ setup: --- "Filters agg with doc_count": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: implementation changed when there is more than one bucket 8.3.0 - features: default_shards + test_runner_features: default_shards - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml index 7d173ce9511b..3374e21e2a56 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filter.yml @@ -187,8 +187,8 @@ setup: --- "Sorting terms": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: fixed in 7.7.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml index da3010ad8437..c128a33a7358 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/filters_bucket.yml @@ -137,8 +137,8 @@ setup: --- "named filters with bucket sort test": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: introduced in 8.8.0 - do: search: @@ -288,8 +288,8 @@ setup: --- no meta: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Fixed in 8.5" - do: @@ -315,8 +315,8 @@ no meta: --- empty meta: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Fixed in 8.5" - do: @@ -342,8 +342,8 @@ empty meta: --- null meta: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Fixed in 8.5" - do: @@ -365,8 +365,8 @@ null meta: --- "Bad params": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "empty bodies throws exception starting in 7.2" - do: catch: /\[filters\] cannot be empty/ @@ -390,8 +390,8 @@ null meta: --- "cache busting": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: cache fixed in 7.11.0 - do: @@ -458,8 +458,8 @@ null meta: --- nested: - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: fixed in 7.11.0 # Tests that we don't accidentally match nested documents when the filter diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml index 275216291ba1..657d81adba32 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/geo_distance.yml @@ -46,8 +46,8 @@ setup: --- "avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml index 34e357bd7424..da330fd58651 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/global.yml @@ -36,8 +36,8 @@ simple: --- profile: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: fix introduced in 7.13.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml index e84b296a04ec..9d5b9bdf1bb9 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/histogram.yml @@ -255,8 +255,8 @@ setup: --- "histogram with hard bounds": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: hard_bounds were introduced in 7.10.0 - do: @@ -432,8 +432,8 @@ setup: --- "date_histogram": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -504,8 +504,8 @@ setup: --- "date_histogram with offset": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -557,8 +557,8 @@ setup: --- "date_histogram on range": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -609,8 +609,8 @@ setup: --- "date_histogram on range with offset": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: @@ -662,8 +662,8 @@ setup: --- "date_histogram with pre-epoch daylight savings time transition": - - skip: - version: " - 7.6.1" + - requires: + cluster_features: ["gte_v7.6.2"] reason: bug fixed in 7.6.1. - do: @@ -708,8 +708,8 @@ setup: --- "histogram profiler": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug info added in 7.9.0 - do: @@ -765,8 +765,8 @@ setup: --- "date_histogram profiler": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug info added in 7.9.0 - do: @@ -816,8 +816,8 @@ setup: --- "date_histogram with extended_bounds and offset and unmapped": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: fixed in 7.11 - do: @@ -874,8 +874,8 @@ setup: --- "Tiny tiny tiny range": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: fixed in 7.13.0 - do: @@ -902,8 +902,8 @@ setup: --- "Tiny tiny tiny date_range": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: fixed in 7.14.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml index f590fa8807d7..7160946414ca 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_prefix.yml @@ -42,8 +42,8 @@ setup: --- "IPv4 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -76,8 +76,8 @@ setup: # high 24 bits of a field which is an IPv4 address encoded on 16 bytes. As a result the # network part will just 0s. "IPv4 prefix with incorrect is_ipv6": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -101,8 +101,8 @@ setup: --- "IPv4 short prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -138,8 +138,8 @@ setup: --- "IPv6 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -172,8 +172,8 @@ setup: # it will be the 2 bytes whose value is set to 12 hexadecimal) which results to 18 decimal, # with everything else being 0s. "IPv6 prefix with incorrect is_ipv6": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -198,8 +198,8 @@ setup: --- "Invalid IPv4 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: catch: /\[prefix_length\] must be in range \[0, 32\] while value is \[44\]/ @@ -216,8 +216,8 @@ setup: --- "Invalid IPv6 prefix": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: catch: /\[prefix_length] must be in range \[0, 128\] while value is \[170]/ @@ -233,8 +233,8 @@ setup: --- "IPv4 prefix sub aggregation": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -275,8 +275,8 @@ setup: --- "IPv6 prefix sub aggregation": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -316,8 +316,8 @@ setup: --- "IPv6 prefix metric sub aggregation": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -353,8 +353,8 @@ setup: --- "IPv4 prefix appended": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -385,8 +385,8 @@ setup: --- "IPv6 prefix appended": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -417,8 +417,8 @@ setup: --- "Mixed IPv4 and IPv6 with is_ipv6 false": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: @@ -448,8 +448,8 @@ setup: --- "Mixed IPv4 and IPv6 with is_ipv6 true": - - skip: - version: " - 8.2.0" + - requires: + cluster_features: ["gte_v8.2.1"] reason: "Temporarily skipping preparing to backport to 8.1" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml index 0dde5cc5c632..1188482dadc8 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/ip_range.yml @@ -136,8 +136,8 @@ setup: --- "IP Range avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: bulk: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml index 6240b51cc48a..9514f3343c8a 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/matrix_stats_multi_value_field.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: serialization bug fixed in 8.7.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml index 8c81f74a4c66..a5b33a8f9cc1 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/max_metric.yml @@ -200,8 +200,8 @@ setup: --- "Merging results with unmapped fields": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: Fixed in 8.5.0 - do: @@ -218,8 +218,8 @@ setup: --- "Counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml index 65408812c651..cd5e5deead8c 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/median_absolute_deviation_metric.yml @@ -77,8 +77,8 @@ setup: --- "with execution hint": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml index b08f9a690557..eb85790f0383 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/min_metric.yml @@ -201,8 +201,8 @@ setup: --- "Counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml index 177bafaa07ad..cd6feb601b1d 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/moving_fn.yml @@ -769,8 +769,8 @@ bad path: --- "Bad window": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "calendar_interval added in 7.2" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml index 60ab82588006..ab4f57c3c50d 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentile_ranks_tdigest_metric.yml @@ -53,9 +53,9 @@ basic: --- with compression: - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: search: @@ -75,9 +75,9 @@ with compression: --- with execution hint: - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml index c703727c9146..be8f28d2f862 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/percentiles_tdigest_metric.yml @@ -44,8 +44,8 @@ setup: --- "Basic test": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: search: @@ -188,9 +188,9 @@ setup: --- "Execution hint": - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: t-digest forked in 8.9.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml index 3189afce08a8..c8e86024d59c 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/pipeline.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: These new error messages were added in 7.2 - do: @@ -100,10 +100,10 @@ setup: --- "Max pipeline on percentiles tdigest agg with single percent metric value": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: behaviour changed in 8.4.0 - features: close_to + test_runner_features: close_to - do: search: @@ -236,10 +236,10 @@ setup: --- "Max pipeline on percentiles hdr agg with single percent metric value": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: behaviour changed in 8.4.0 - features: close_to + test_runner_features: close_to - do: search: @@ -353,10 +353,10 @@ setup: --- "Max pipeline on percentiles with incorrect name": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: behaviour changed in 8.4.0 - features: close_to + test_runner_features: close_to - do: catch: /No aggregation \[unknown_aggregation\] found for path \[the_terms\>unknown_aggregation\]\;/ diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml index 4e93e9c83785..5b2c2dc379cb 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml @@ -30,9 +30,9 @@ setup: --- "Test random_sampler aggregation with no filter": - - skip: - features: close_to - version: " - 8.1.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.2.0"] reason: added in 8.2.0 - do: search: @@ -80,8 +80,8 @@ setup: - match: { aggregations.sampled.mean.value: 2.5 } --- "Test random_sampler aggregation with filter": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: added in 8.2.0 - do: search: @@ -143,8 +143,8 @@ setup: - match: { aggregations.sampled.mean.value: 1.0 } --- "Test random_sampler aggregation with poor settings": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: added in 8.2.0 - do: catch: /\[probability\] must be between 0.0 and 0.5 or exactly 1.0, was \[1.5\]/ diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml index cf110dc3e7af..639ea6649ddb 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range.yml @@ -73,8 +73,8 @@ setup: --- "Float Endpoint Exclusive": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: Bug fixed in 7.16.0 - do: search: @@ -102,8 +102,8 @@ setup: --- "Half Float Endpoint Exclusive": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: Bug fixed in 7.16.0 - do: search: @@ -131,8 +131,8 @@ setup: --- "Float range": - - skip: - version: " - 7.17.0" + - requires: + cluster_features: ["gte_v7.17.1"] reason: Bug fixed in 8.1.0 and backported to 7.17.1 - do: search: @@ -170,8 +170,8 @@ setup: --- "Double range": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: Bug fixed in 8.1.0 and backported to 7.17.0 - do: search: @@ -209,8 +209,8 @@ setup: --- "Double range on long field": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: Bug fixed in 8.1.0 - do: search: @@ -433,8 +433,8 @@ setup: --- "Range aggregation on date field": - - skip: - version: " - 7.16.99" + - requires: + cluster_features: ["gte_v7.17.0"] reason: Fixed in 8.1.0 and backported to 7.17.0 - do: @@ -462,8 +462,8 @@ setup: --- "Min and max long range bounds": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: Bug fixed in 8.1.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml index 87641f43211d..fcecf8c110e7 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/range_timezone_bug.yml @@ -20,8 +20,8 @@ setup: --- "respect offsets in range bounds": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Fixed in 7.16" - do: search: @@ -54,8 +54,8 @@ setup: --- "offsets and timezones play nicely together": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Fixed in 7.16" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml index 3235925d8e00..a1dc99ca46d0 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/rare_terms.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: RareTerms added in 7.3.0 - do: indices.create: @@ -308,8 +308,8 @@ setup: --- "sub aggs": - - skip: - version: " - 7.6.1" + - requires: + cluster_features: ["gte_v7.6.2"] reason: Sub aggs fixed in 7.6.1 - do: @@ -356,8 +356,8 @@ setup: --- "avg_bucket": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: Fixed in 7.8.0 - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml index 1f7580281140..96f938776998 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/serial_diff.yml @@ -121,8 +121,8 @@ parent has gap: --- parent has min_doc_count: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: allowed in 8.3.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml index 777820c0c0ba..e8b0419589ed 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/sig_terms.yml @@ -74,8 +74,8 @@ --- "Test background filter count ": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: bugfix introduced in 7.15.0 - do: @@ -221,8 +221,8 @@ --- 'Misspelled fields get "did you mean"': - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: introduced in 7.7.0 - do: catch: /\[significant_terms\] unknown field \[jlp\] did you mean \[jlh\]\?/ @@ -236,8 +236,8 @@ --- "Test alias background filter": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: fixed in 8.4 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml index 1b940014e8d6..39ceaa4ab901 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_text.yml @@ -118,8 +118,8 @@ simple: --- profile: - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: extra profiling added in 7.14.0 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml index ef63c2853ede..485a2b2257a3 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/significant_texts.yml @@ -43,8 +43,8 @@ setup: --- "significant_texts all terms": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -88,8 +88,8 @@ setup: --- "significant_texts limited size": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -128,8 +128,8 @@ setup: --- "significant_texts with min_doc_count": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -164,8 +164,8 @@ setup: --- "significant_texts with exclude": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: @@ -207,8 +207,8 @@ setup: --- "significant_texts with include": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml index de82c8351c43..1b2d1ad6883e 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms.yml @@ -79,8 +79,8 @@ setup: --- "IP test": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "Changed rest status for error in 8.12" - do: @@ -751,8 +751,8 @@ setup: --- "No field or script": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "Exception was a deep, server exception before 7.8" - do: catch: /Required one of fields \[field, script\], but none were specified/ @@ -763,8 +763,8 @@ setup: --- "string profiler via global ordinals filters implementation": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: profile info changed in 8.0.0 to be backported to 7.14.0 - do: bulk: @@ -815,8 +815,8 @@ setup: --- "string profiler via global ordinals native implementation": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug information added in 7.9.0 - do: bulk: @@ -927,8 +927,8 @@ setup: --- "string profiler via map": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug information added in 7.9.0 - do: bulk: @@ -976,8 +976,8 @@ setup: --- "numeric profiler": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: debug information added in 7.9.0 - do: bulk: @@ -1013,8 +1013,8 @@ setup: --- "min_doc_count": - - skip: - version: " - 7.9.2" + - requires: + cluster_features: ["gte_v7.9.3"] reason: broken in 7.9.1, was fixed in 7.9.2 - do: @@ -1178,9 +1178,9 @@ setup: --- "order by sub agg containing nested": - - skip: - version: " - 7.11.2" - reason: "It was fixed in 7.11.2" + - requires: + cluster_features: ["gte_v7.11.3"] + reason: "It was fixed in 7.11.2" - do: indices.put_mapping: index: test_1 @@ -1334,9 +1334,9 @@ precise size: --- huge size: - - skip: - version: " - 7.14.0" - reason: "Fixed in 7.14.1" + - requires: + cluster_features: ["gte_v7.14.1"] + reason: "Fixed in 7.14.1" - do: bulk: @@ -1378,9 +1378,9 @@ huge size: --- Value type mismatch fails shard: - - skip: - version: " - 8.0.99" - reason: "Fixed in 8.1" + - requires: + cluster_features: ["gte_v8.1.0"] + reason: "Fixed in 8.1" - do: indices.create: @@ -1452,9 +1452,9 @@ Value type mismatch fails shard: --- Value type mismatch fails shard with no docs: - - skip: - version: " - 8.0.99" - reason: "Fixed in 8.1" + - requires: + cluster_features: ["gte_v8.1.0"] + reason: "Fixed in 8.1" - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml index a3e606beeada..a22bb2afdc47 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_disable_opt.yml @@ -36,8 +36,8 @@ teardown: --- disable optimization: - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: setting to disable optimization added in 7.13.2 - do: @@ -65,8 +65,8 @@ disable optimization: --- enable optimization: - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: setting to disable optimization added in 7.13.2 - do: @@ -93,8 +93,8 @@ enable optimization: --- enabled by default: - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: setting to disable optimization added in 7.13.2 - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml index 9576b3a3d958..8270fc59dc3b 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/terms_flattened_field.yml @@ -25,8 +25,8 @@ setup: - '{"flattened.primary": "quux"}' --- "Key exists, no missing values": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -49,8 +49,8 @@ setup: - match: { aggregations.primary_terms.buckets.2.doc_count: 1 } --- "Key exists, missing values, missing specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -74,8 +74,8 @@ setup: - match: { aggregations.primary_terms.buckets.2.doc_count: 1 } --- "Key exists, missing values, missing not specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -95,8 +95,8 @@ setup: - match: { aggregations.primary_terms.buckets.1.doc_count: 1 } --- "Key does not exist, missing specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: @@ -115,8 +115,8 @@ setup: - match: { aggregations.primary_terms.buckets.0.doc_count: 4 } --- "Key does not exist, missing not specified": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "fixed in 8.4" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml index 421c0c580094..7800923ab158 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: "8.7.00 - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Synthetic source shows up in the mapping in 8.10 and on, may trigger assert failures in mixed cluster tests" - do: @@ -54,8 +54,8 @@ setup: --- "Basic test": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: Time series result serialization changed in 8.6.0 - do: @@ -83,8 +83,8 @@ setup: --- "Basic test profiled": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: Time series profiling enabled in 8.8 - do: @@ -107,8 +107,8 @@ setup: --- "Size test": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -151,8 +151,8 @@ setup: --- "Score test filter some": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: Time series min score fixed in 8.9 - do: @@ -179,8 +179,8 @@ setup: --- "Score test filter all": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: Time series min score fixed in 8.9 - do: @@ -205,8 +205,8 @@ setup: --- "Sampler aggregation with nested time series aggregation failure": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Handling for time series aggregation failures introduced in 8.7.0" - do: @@ -234,8 +234,8 @@ setup: --- "Composite aggregation with nested time series aggregation failure": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Handling for time series aggregation failures introduced in 8.7.0" - do: @@ -271,8 +271,8 @@ setup: --- "Global aggregation with nested time series aggregation failure": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Handling for time series aggregation failures introduced in 8.7.0" - do: @@ -293,8 +293,8 @@ setup: field: val --- "Configure with no synthetic source": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "Error message fix in 8.9" - do: @@ -311,8 +311,8 @@ setup: --- "Number for keyword routing field": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -354,8 +354,8 @@ setup: # collection and reduction order. Note that changing the hashing algorithm might require selecting proper values # for dimensions fields such that sort(_tsid, timestamp) != sort(_tsid hash, timestamp). - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -453,8 +453,8 @@ setup: --- "auto_date_histogram aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Handling for time series aggregation failures introduced in 8.13.0" - do: @@ -472,8 +472,8 @@ setup: --- "variable_width_histogram aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Handling for time series aggregation failures introduced in 8.13.0" - do: @@ -491,8 +491,8 @@ setup: --- "rare_terms aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Handling for time series aggregation failures introduced in 8.13.0" - do: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml index 5cf0265374b0..ed24e1cc8404 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits.yml @@ -348,8 +348,8 @@ sequence number and primary term: --- synthetic _source: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -432,8 +432,8 @@ synthetic _source: --- "having": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: fixed in 8.9.0 - do: bulk: @@ -719,8 +719,8 @@ synthetic _source: --- runtime fields: - - skip: - version: " - 8.9.1" + - requires: + cluster_features: ["gte_v8.9.2"] reason: "bugfix #97460 added in 8.9.1" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml index fa675360881e..2f448808eb67 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/top_hits_nested_metric.yml @@ -79,8 +79,8 @@ setup: --- "top_hits aggregation with nested documents and disabled _source": - - skip: - version: " - 7.10.1" + - requires: + cluster_features: ["gte_v7.10.2"] reason: "bug fix introduced in 7.10.2" - do: indices.create: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml index fdc997e77131..7041dc5b85a1 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/typed_keys.yml @@ -203,8 +203,8 @@ setup: --- "Test typed keys parameter for date_histogram aggregation and max_bucket pipeline aggregation": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "calendar_interval added in 7.2" - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml index d42bc1cbff43..0f66dd0d871b 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/variable_width_histogram.yml @@ -37,8 +37,8 @@ setup: --- defaults: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: @@ -63,8 +63,8 @@ defaults: --- num_buckets: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: @@ -83,8 +83,8 @@ num_buckets: --- shard_size: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: @@ -103,8 +103,8 @@ shard_size: --- initial_buffer: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: added in 7.9.0 - do: search: diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml index 3563e0da18e5..a43b00ce6155 100644 --- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml +++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/weighted_avg.yml @@ -183,10 +183,10 @@ setup: --- "Multi weight field not allowed": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "Changed status code in 8.12" - features: close_to + test_runner_features: close_to - do: catch: bad_request search: diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml index a19a1f272191..b9476e04f996 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml @@ -1,8 +1,8 @@ --- "get cluster stats returns analysis stats": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "analysis stats are added for v7.7.0" - do: diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml index de766acbcd43..5583bb98dc1c 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/20_analysis_stats_synonyms.yml @@ -1,8 +1,8 @@ --- "get cluster stats returns synonym sets stats": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "synonym sets stats are added for v8.10.0" - do: diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml index 35a611d13f35..97f63310b0b0 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml @@ -22,8 +22,8 @@ setup: --- "Test use_field": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml index 7f1ec1f2c685..b88584f9038f 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/100_delete_by_query.yml @@ -1,8 +1,8 @@ --- "DBQ from data stream": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -68,9 +68,9 @@ --- "Delete by query for multiple data streams": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml index 6187c1a0dfed..a7ec53782382 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml @@ -29,8 +29,8 @@ setup: --- "Create data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -113,8 +113,8 @@ setup: --- "Create hidden data stream": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "hidden data streams only available in 7.11" - do: allowed_warnings: @@ -209,8 +209,8 @@ setup: --- "Create data stream with failure store": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "data stream failure stores only creatable in 8.11+" - do: @@ -310,8 +310,8 @@ setup: --- "Create data stream with invalid name": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -325,8 +325,8 @@ setup: --- "Create existing data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -350,8 +350,8 @@ setup: --- "Get data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -415,8 +415,8 @@ setup: --- "Get data stream and check DSL and ILM information": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "data streams DSL and ILM mixing information available in 8.11+" - do: @@ -486,8 +486,8 @@ setup: --- "Delete data stream with backing indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -537,9 +537,9 @@ setup: --- "Delete data stream with failure stores": - - skip: - version: " - 8.11.99" - reason: "data stream failure stores only supported in 8.12+" + - requires: + cluster_features: ["gte_v8.12.0"] + reason: "data stream failure stores only supported in 8.12+" - do: allowed_warnings: @@ -611,8 +611,8 @@ setup: --- "Delete data stream missing behaviour": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -656,8 +656,8 @@ setup: --- "Delete data stream by wildcard": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams supported only in 7.9+" - do: @@ -693,10 +693,10 @@ setup: --- "append-only writes to backing indices prohibited": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -755,10 +755,10 @@ setup: --- "Indexing a document into a data stream without a timestamp field": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -804,10 +804,10 @@ setup: --- "Include metadata in a data stream": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "re-enable in 7.11 when backported" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -846,10 +846,10 @@ setup: --- "Create index into a namespace that is governed by a data stream template": - - skip: - version: " - 7.9.1" + - requires: + cluster_features: ["gte_v7.9.2"] reason: "validation added in 7.9.2" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -874,8 +874,8 @@ setup: --- "Get data stream api check existence of replicated field": - - skip: - version: " - 7.16.0" + - requires: + cluster_features: ["gte_v7.16.1"] reason: "replicated field only supported in 7.16+" - do: @@ -925,8 +925,8 @@ setup: --- "Get data stream api check existence of allow_custom_routing field": - - skip: - version: " - 8.0.0" + - requires: + cluster_features: ["gte_v8.0.1"] reason: "allow_custom_routing field only supported in 8.0+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml index ccf7cead1d70..53cc8279b5ae 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/110_update_by_query.yml @@ -1,8 +1,8 @@ --- "Update by query from data stream": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -107,9 +107,9 @@ --- "Update by query for multiple data streams": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml index 21eceeccf6c1..7ee9e656007e 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/120_data_streams_stats.yml @@ -26,8 +26,8 @@ setup: --- "No data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -38,8 +38,8 @@ setup: --- "Empty data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -67,8 +67,8 @@ setup: --- "Single data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -99,8 +99,8 @@ setup: --- "Rolled over data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -144,8 +144,8 @@ setup: --- "Multiple data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml index fcacdc437a9d..73ce2afb26aa 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/130_migrate_to_data_stream.yml @@ -1,9 +1,9 @@ --- "Migrate to data stream": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "migrate API released in 7.11.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml index 1050d6e01a95..6eaa751f845a 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/140_data_stream_aliases.yml @@ -1,9 +1,9 @@ --- "Create data stream alias": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "data streams aliases are available from 7.14.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -74,10 +74,10 @@ --- "Create data stream alias with filter": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "data stream alias filter supported was added in 7.15.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -154,10 +154,10 @@ --- "Create data stream aliases using wildcard expression": - - skip: - version: " - 7.14.0" + - requires: + cluster_features: ["gte_v7.14.1"] reason: "bugfix fixed from 7.14.1 and later" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -196,10 +196,10 @@ --- "Fix IndexNotFoundException error when handling remove alias action": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Fix available from 7.16.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -262,10 +262,10 @@ --- "Test get alias with non-matching data streams": - - skip: - version: " - 8.12.1" + - requires: + cluster_features: ["gte_v8.12.2"] reason: "bugfix fixed from 8.12.1 and later" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml index 683cf675cda8..355a549b6fbf 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/150_tsdb.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -86,8 +86,8 @@ setup: --- created the data stream: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -132,8 +132,8 @@ created the data stream: --- fetch the tsid: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -151,8 +151,8 @@ fetch the tsid: --- "aggregate the tsid": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hahing introduced in 8.13 - do: @@ -194,8 +194,8 @@ index without timestamp with pipeline: --- dynamic templates: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -325,8 +325,8 @@ dynamic templates: --- dynamic templates - conflicting aliases: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -422,8 +422,8 @@ dynamic templates - conflicting aliases: --- dynamic templates with nesting: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -579,8 +579,8 @@ dynamic templates with nesting: --- dynamic templates with incremental indexing: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for dynamic fields was added in 8.13" - do: allowed_warnings: @@ -773,8 +773,8 @@ dynamic templates with incremental indexing: --- subobject in passthrough object auto flatten: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for passthrough fields was added in 8.13" - do: allowed_warnings: @@ -818,8 +818,8 @@ subobject in passthrough object auto flatten: --- enable subobjects in passthrough object: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Support for passthrough fields was added in 8.13" - do: catch: /Mapping definition for \[attributes\] has unsupported parameters:\ \[subobjects \:\ true\]/ diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml index b0a3c45d8f6b..5edcf0e61c56 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/170_modify_data_stream.yml @@ -1,9 +1,9 @@ --- "Modify a data stream": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "this API was released in 7.16.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml index 87ca5a0c7a0b..94918a7f9061 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/180_simulate_existing_data_stream.yml @@ -1,9 +1,9 @@ --- "Simulate an index with the same name as a data stream that already exists": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "simulating index template API for an existing index has not yet been backported" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml index f22267357104..7268ee9bb3b5 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml @@ -22,10 +22,10 @@ teardown: --- "Redirect ingest failure in data stream to failure store": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "data stream failure stores only redirect ingest failures in 8.13+" - features: [allowed_warnings, contains] + test_runner_features: [allowed_warnings, contains] - do: ingest.put_pipeline: @@ -111,10 +111,10 @@ teardown: --- "Redirect shard failure in data stream to failure store": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "data stream failure stores only redirect shard failures in 8.14+" - features: [allowed_warnings, contains] + test_runner_features: [allowed_warnings, contains] - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml index df9f0840f575..d9f26343a454 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_require_data_stream.yml @@ -1,9 +1,9 @@ --- "Testing require_data_stream in index creation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "require_data_stream was introduced in 8.13.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -59,10 +59,10 @@ --- "Testing require_data_stream in bulk requests": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "require_data_stream was introduced in 8.13.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml index 46d46e8291ae..0074ce425c6f 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/200_rollover_failure_store.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "data stream failure store rollover only supported in 8.14+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml index 32eb90833102..709eb41ccb61 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/20_unsupported_apis.yml @@ -1,9 +1,9 @@ --- "Test apis that do not supported data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -57,10 +57,10 @@ --- "Prohibit clone on data stream's write index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -101,10 +101,10 @@ --- "Prohibit shrink on data stream's write index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -144,10 +144,10 @@ --- "Prohibit split on data stream's write index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -188,10 +188,10 @@ --- "Non append-only writes into a data stream": - - skip: - version: " - 7.9.3" + - requires: + cluster_features: ["gte_v7.9.4"] reason: "validation bug only backported to 7.9.3" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml index 303a584555f8..32338fea056a 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/30_auto_create_data_stream.yml @@ -1,9 +1,9 @@ --- "Put index template": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -49,10 +49,10 @@ --- "Put index template with failure store": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "data stream failure stores only creatable in 8.11+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml index 7117ad486184..72fce418d889 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/40_supported_apis.yml @@ -23,8 +23,8 @@ teardown: --- "Verify get index api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" # save the backing index names for later use @@ -41,8 +41,8 @@ teardown: --- "Verify get mapping api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" # save the backing index names for later use @@ -59,10 +59,10 @@ teardown: --- "Verify shard stores api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -118,9 +118,9 @@ teardown: - is_true: acknowledged --- "Verify search shards api": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -150,9 +150,9 @@ teardown: --- "Verify get field mappings api": - - skip: - features: allowed_warnings - version: " - 7.8.99" + - requires: + test_runner_features: allowed_warnings + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -189,10 +189,10 @@ teardown: --- "Open write index for data stream opens all backing indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -262,10 +262,10 @@ teardown: --- "Verify rank eval with data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml index 729e376bfaba..4c46d4919dcb 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/50_delete_backing_indices.yml @@ -12,8 +12,8 @@ setup: --- "Delete backing index on data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: @@ -73,8 +73,8 @@ setup: --- "Attempt to delete write index on data stream is rejected": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml index d74ab4770fcc..a92871f066f8 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/60_get_backing_indices.yml @@ -1,9 +1,9 @@ --- "Get backing indices for data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml index bcf207e52d7c..a66c2bd1448d 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/70_rollover_data_streams.yml @@ -1,9 +1,9 @@ --- "Roll over a data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml index 8694a14448da..810b0e43a0da 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/80_resolve_index_data_streams.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index api only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -66,8 +66,8 @@ setup: --- "Resolve index with indices, aliases, and data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index api only supported in 7.9+" - do: @@ -110,8 +110,8 @@ setup: --- "Resolve index with hidden and closed indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index api only supported in 7.9+" - do: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml index 3d70acdd4ea2..ea2b49c9139d 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/90_reindex.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do : allowed_warnings: @@ -22,10 +22,10 @@ teardown: --- "Reindex from data stream into another data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: @@ -55,10 +55,10 @@ teardown: --- "Reindex from index into data stream": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: @@ -88,10 +88,10 @@ teardown: --- "Reindex from data stream into an index": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: index: diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml index e2268ee9118a..745fd342d3a4 100644 --- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml +++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/lifecycle/190_create_data_stream_with_lifecycle.yml @@ -1,9 +1,9 @@ --- "Create data stream with lifecycle": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Data stream lifecycle with effective retention was released in 8.14" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: - "index template [template-with-lifecycle] has index patterns [managed-data-stream] matching patterns from existing older templates [global] with patterns (global => [*]); this template [template-with-lifecycle] will take precedence during new index creation" diff --git a/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml index 8a27108cf9a8..523213919484 100644 --- a/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml +++ b/modules/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml @@ -1,7 +1,7 @@ --- "Test ingest attachment processor with .doc file": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "new fields added in 8.0.0" - do: ingest.put_pipeline: @@ -44,8 +44,8 @@ --- "Test ingest attachment processor with .docx file": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "tika upgraded in 8.3.0" - do: ingest.put_pipeline: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml index 56f80d7bbe1d..e2b226abb70b 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/15_info_ingest.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "/_info/ingest only available from v8.9" --- diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml index 53928894ceec..c4bac119d849 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml @@ -280,8 +280,8 @@ teardown: --- "Test adding circular references fails pipeline": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "Test causes fatal error prior to 8.3.0" - do: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml index 59fd640705e2..8a7b28760adc 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml @@ -67,8 +67,8 @@ teardown: --- "Test Pipeline Processor with Circular Pipelines": -- skip: - version: " - 8.12.99" +- requires: + cluster_features: ["gte_v8.13.0"] reason: exception class changed in 8.13.0 - do: ingest.put_pipeline: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml index 68fa8d6c8601..f93a35aac2c9 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml @@ -1,7 +1,7 @@ --- "Test pipeline versioned updates": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "added versioned updates in 7.16.0" - do: diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml index 0c18cd8814bb..c8ef06a18fe7 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml @@ -186,8 +186,8 @@ teardown: --- "Update with pipeline": - - skip: - version: " - 7.17.4" + - requires: + cluster_features: ["gte_v7.17.5"] reason: "fixed in 7.17.5" - do: diff --git a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml index 78170cb8af86..117076808658 100644 --- a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml +++ b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml @@ -164,8 +164,8 @@ --- "Test explain templated search": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: Bug fix for explain in search template added in 8.8.0 - do: diff --git a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml index 9d20462900ab..109bc8888889 100644 --- a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml +++ b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml @@ -31,8 +31,8 @@ setup: --- "Basic multi-search template": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: @@ -74,9 +74,9 @@ setup: --- "Multi-search template with errors": - - - skip: - version: " - 8.2.99" + + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: @@ -151,8 +151,8 @@ setup: --- "Basic multi-search using stored template": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: @@ -197,8 +197,8 @@ setup: --- "Test with rest_total_hits_as_int": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "status field checks were added in 8.3" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml index 37dbbe34a3ed..8e5fcfddd48e 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml @@ -1,7 +1,7 @@ # Integration tests for ScriptScoreQuery using Painless setup: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "boost was corrected in script_score query from 8.0" - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml index ed1f93ccc33d..6ac4ba01c34e 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/145_dense_vector_byte_basic.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" - features: headers + test_runner_features: headers - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml index 8b2a4f9887f9..c3d008ea69d0 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/155_dense_vector_byte_l1l2.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" - features: headers + test_runner_features: headers - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml index a9f6948272f1..09512b6585a1 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml @@ -126,8 +126,8 @@ --- "Script Update Metadata": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "update metadata introduced in 8.4.0" - do: @@ -170,8 +170,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml index fc24964feafe..90e91c32c8f6 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/160_dense_vector_special_cases.yml @@ -27,8 +27,8 @@ setup: --- "Indexing of Dense vectors should error when dims don't match defined in the mapping": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "exception changed in 8.8" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml index 4848b1d57645..b1454a1fac3a 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/165_dense_vector_byte_special_cases.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" - features: headers + test_runner_features: headers - do: indices.create: @@ -31,8 +31,8 @@ setup: --- "Indexing of Dense vectors should error when dims don't match defined in the mapping": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "exception changed in 8.8" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml index dd0cc8cde92b..b5c1362725b3 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/170_dense_vector_script_access.yml @@ -64,8 +64,8 @@ --- "Access to values of indexed dense_vector in script": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "Access to values of dense_vector in script was added in 7.13" - do: indices.create: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml index c361c0a082bc..35119f179091 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/175_dense_vector_byte_script_access.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" --- diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml index 3d6db1b781ca..30a7943e271a 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml @@ -1,7 +1,7 @@ --- "Script errors contain position": - - skip: - version: " - 7.7.0" + - requires: + cluster_features: ["gte_v7.7.1"] reason: "position introduced in 7.7" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml index 75d2ca8d3a7a..069f93352ff1 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/180_knn_and_binary_dv_fields_api.yml @@ -1,7 +1,7 @@ --- "size and isEmpty code works for any vector, including empty": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -87,8 +87,8 @@ --- "null can be used for default value": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -174,8 +174,8 @@ --- "empty dense vector throws for vector accesses": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -294,8 +294,8 @@ --- "dot product works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -413,8 +413,8 @@ --- "iterator over dense vector values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -490,8 +490,8 @@ --- "l1Norm works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -593,8 +593,8 @@ --- "l2Norm works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -712,8 +712,8 @@ --- "cosineSimilarity works on dense vectors": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Fields API for dense vector added in 8.2" - do: @@ -811,8 +811,8 @@ --- "query vector of wrong type errors": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "Fields API for dense vector added in 8.2" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml index 643f694e12c3..824d3061045e 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/185_knn_and_binary_byte_dv_fields_api.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "support for byte vectors added in 8.6" --- diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml index 8ab1cbf769d1..4f19de00b83e 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml @@ -96,8 +96,8 @@ --- "Script Upsert Metadata": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "update metadata introduced in 8.4.0" - do: @@ -190,8 +190,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml index 1cf44a6b27d1..06788a55c2d1 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml @@ -500,8 +500,8 @@ --- "Script Score With Highlight": - - skip: - version: " - 7.4.0" + - requires: + cluster_features: ["gte_v7.4.1"] reason: "highlight for script_score was introduced in 7.4.1" - do: diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml index d96b0ce42ec2..4737d66624f9 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml @@ -1,8 +1,8 @@ # Integration tests for ScriptScoreQuery using Painless setup: -- skip: - version: " - 7.1.99" +- requires: + cluster_features: ["gte_v7.2.0"] reason: "random score function of script score was added in 7.2" --- diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml index 070a41b0153c..7d1d6e2edec3 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "match_only_text was added in 7.14" - do: @@ -256,8 +256,8 @@ setup: --- "Wildcard highlighting": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "Wildcard highlighting on match_only_text was fixed in 8.3" - do: @@ -277,8 +277,8 @@ setup: --- synthetic_source: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: synthetic source introduced in 8.4.0 - do: @@ -310,8 +310,8 @@ synthetic_source: --- tsdb: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: bug fixed in 8.10.0 - do: diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml index eab28f07d681..926ac3e77040 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/20_null_value.yml @@ -1,8 +1,8 @@ --- "Non positive null_value": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "null_value parameter was added in 8.9.0" - do: @@ -21,8 +21,8 @@ --- "Search rank_feature with and without null_value": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "null_value parameter was added in 8.9.0" - do: diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml index 15e44e5e7b73..07e0a3585256 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "added in 7.2.0" - do: diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml index f9be93ca8c11..91b79078635d 100644 --- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml +++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "added in 7.2.0" - do: diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml index 5df0d110d20c..0121f89b9950 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml @@ -28,8 +28,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -68,8 +68,8 @@ teardown: --- "HasChild disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Update setting to false diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml index 2ac3a8dd8315..daa9068162ff 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml @@ -30,8 +30,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -100,8 +100,8 @@ teardown: --- "Test field retrieval": - - skip: - version: " - 7.13.1" + - requires: + cluster_features: ["gte_v7.13.2"] reason: bugfix was introduced in 7.13.2 - do: search: @@ -121,8 +121,8 @@ teardown: --- "HasChild disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Update setting to false @@ -147,10 +147,10 @@ teardown: --- "deprecated use of multi-fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "deprecation added in 8.14" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml index fab161baf175..6395d3e0f8db 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "The bug was corrected from 7.6.0" - do: @@ -46,8 +46,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -58,8 +58,8 @@ teardown: --- "Test two sub-queries with only one having inner_hits": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "The bug was corrected from 7.7.0" - do: @@ -87,8 +87,8 @@ teardown: --- "HasParent disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Update setting to false diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml index 56f6dd1dc9d8..b8f6751dac9a 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/50_order_by.yml @@ -2,7 +2,7 @@ "order by sub agg containing join": - skip: reason: "https://github.com/elastic/elasticsearch/issues/66876" - version: "7.11.1 - " + cluster_features: ["gte_v7.11.1"] - do: indices.create: index: test_1 @@ -73,7 +73,7 @@ "order by sub agg containing join and nested": - skip: reason: "https://github.com/elastic/elasticsearch/issues/66876" - version: "7.11.1 - " + cluster_features: ["gte_v7.11.1"] - do: indices.create: index: test_1 @@ -153,7 +153,7 @@ "order by sub agg containing join and nested and filter": - skip: reason: "https://github.com/elastic/elasticsearch/issues/66876" - version: "7.11.1 - " + cluster_features: ["gte_v7.11.1"] - do: indices.create: index: test_1 diff --git a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml index 55d39940081b..4ebc6cf4e9d6 100644 --- a/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml +++ b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source.yml @@ -1,6 +1,6 @@ unsupported: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: diff --git a/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml b/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml index 1e692bc43fab..665e494412e9 100644 --- a/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml +++ b/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/20_matched_queries.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Displaying matched named queries within percolator queries was added in 8.13" - do: indices.create: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml index 8ae4d151635e..7f7132d378d8 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml @@ -89,7 +89,7 @@ --- "Response for version conflict (version powered)": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: @@ -278,7 +278,7 @@ --- "Limit by size pre 7.3": - skip: - version: "7.3.0 - " + cluster_features: ["gte_v7.3.0"] reason: "7.3 should use max_docs or get deprecation warning" - do: @@ -320,8 +320,8 @@ --- "Limit by max_docs in URL": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -363,8 +363,8 @@ --- "Limit by max_docs in body": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -448,8 +448,8 @@ --- tsdb: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml index d07b61e32b9e..84a81c6948d2 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml @@ -32,8 +32,8 @@ --- "invalid max_docs fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -52,8 +52,8 @@ --- "max_docs shoule be greater than slices": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml index cb97e957e839..9f8490192c84 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml @@ -1,7 +1,7 @@ --- "delete_by_query fails to delete documents with version number equal to zero": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml index 98996cc9c24b..40d5dda5aa29 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/100_tsdb.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -90,8 +90,8 @@ setup: --- from tsdb to standard: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -126,8 +126,8 @@ from tsdb to standard: --- from tsdb to tsdb: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -170,8 +170,8 @@ from tsdb to tsdb: --- from standard with tsdb id to tsdb: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 # Populate the standard index @@ -237,8 +237,8 @@ from standard with tsdb id to tsdb: --- from standard with random _id to tsdb: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 # Populate the standard index @@ -304,8 +304,8 @@ from standard with random _id to tsdb: --- from tsdb to tsdb modifying timestamp: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -353,8 +353,8 @@ from tsdb to tsdb modifying timestamp: --- from tsdb to tsdb modifying dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: @@ -402,10 +402,10 @@ from tsdb to tsdb modifying dimension: --- from tsdb to tsdb created by template while modifying dimension: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml index 4cb0f58e12bb..9ae2153f89ca 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/110_synthetic_source.yml @@ -21,8 +21,8 @@ setup: --- from synthetic: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: @@ -84,8 +84,8 @@ from synthetic: --- from standard: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml index 762e63fb329b..c96414e46f7e 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml @@ -96,8 +96,8 @@ --- "specifying size fails": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "size supported until 8" - do: @@ -118,8 +118,8 @@ --- "invalid max_docs in body fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -139,8 +139,8 @@ --- "max_docs shoule be greater than slices": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -161,8 +161,8 @@ --- "invalid max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -182,8 +182,8 @@ --- "inconsistent max_docs in body and max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml index 4aac33d52fb6..cef101068cee 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml @@ -34,7 +34,7 @@ --- "Sorting and size combined pre 7.3": - skip: - version: "7.3.0 - " + cluster_features: ["gte_v7.3.0"] reason: "7.3 should use max_docs or get deprecation warning" - do: @@ -76,10 +76,10 @@ --- "Sorting and max_docs in body combined": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "max_docs introduced in 7.3.0, but sort deprecated in 7.6" - features: "warnings" + test_runner_features: "warnings" - do: index: @@ -123,10 +123,10 @@ --- "Sorting deprecated wait_for_completion false": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "sort deprecated in 7.6" - features: "warnings" + test_runner_features: "warnings" - do: index: @@ -158,8 +158,8 @@ --- "max_docs in URL": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml index a09211c3dec6..c538450fa5bc 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml @@ -443,8 +443,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml index 325f04446684..b08ce231490c 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml @@ -219,8 +219,8 @@ --- "Reindex from remote with max_docs": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml index f1d7b481f529..572577348917 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml @@ -74,7 +74,7 @@ --- "Response for version conflict (version powered)": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: indices.create: @@ -216,7 +216,7 @@ --- "Limit by size pre 7.3": - skip: - version: "7.3.0 - " + cluster_features: ["gte_v7.3.0"] reason: "7.3 should use max_docs or get deprecation warning" - do: @@ -245,8 +245,8 @@ --- "Limit by max_docs in URL": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -275,8 +275,8 @@ --- "Limit by max_docs in body": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml index df3d7d5ef5da..7969b507243c 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml @@ -13,8 +13,8 @@ --- "invalid max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -30,8 +30,8 @@ --- "invalid max_docs in body fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -48,8 +48,8 @@ --- "inconsistent max_docs in body and max_docs in URL fails": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: @@ -69,8 +69,8 @@ --- "max_docs shoule be greater than slices": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "max_docs introduced in 7.3.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml index 477e83452adf..d7b79146f38d 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml @@ -23,7 +23,7 @@ --- "update_by_query fails to update documents with version number equal to zero": - skip: - version: "6.7.0 - " + cluster_features: ["gte_v6.7.0"] reason: reindex moved to rely on sequence numbers for concurrency control - do: index: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml index b646fd864718..bef39938cffd 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml @@ -132,8 +132,8 @@ --- "Setting bogus context is an error": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "error message changed in 8.5" - do: index: @@ -154,8 +154,8 @@ --- "Can't change _id": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "error message changed in 8.5" - do: index: @@ -313,8 +313,8 @@ --- "Set unsupported operation type": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "error message changed in 8.5" - do: index: @@ -442,8 +442,8 @@ --- "Can read version": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: fixed in 8.4.0 - do: @@ -508,8 +508,8 @@ --- "Script Write Field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Write fields api introduced in 8.5.0" - do: diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml index cee4395eb87f..51a5884ab286 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_tsdb.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml index e8bf1f84e643..7bd7b6c7779e 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml @@ -110,8 +110,8 @@ setup: --- "fetch multiple stored fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "bug fixed in 8.14" - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml index dad3ce22e945..13af92f9aa84 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/110_composite.yml @@ -106,8 +106,8 @@ query: --- "Field caps with composite runtime mappings section. Issue 76742": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: Composite Runtime mappings support was added in 7.15 - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml index ac2a56cf26b1..8832b3230910 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/270_synthetic_source.yml @@ -1,7 +1,7 @@ --- keywords: - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: @@ -68,8 +68,8 @@ keywords: --- doubles: - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml index b956fd57ac13..0e7d0b78bba4 100644 --- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml +++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/40_runtime_mappings.yml @@ -21,8 +21,8 @@ setup: --- "Field caps with runtime mappings section": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: @@ -49,8 +49,8 @@ setup: --- "Field caps with runtime mappings section overwriting existing mapping": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: Runtime mappings support was added in 7.10 - do: @@ -89,8 +89,8 @@ setup: --- "Field caps with errors in runtime mappings section throws": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: Runtime mappings support was added in 7.12 - do: diff --git a/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml b/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml index 6ef35999307c..36ce0260b046 100644 --- a/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml +++ b/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml @@ -251,8 +251,8 @@ --- "Annotated highlighter on annotated text exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: diff --git a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java index d91f7cf3e9a8..cc613671c860 100644 --- a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java +++ b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java @@ -23,7 +23,6 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.common.CheckedSupplier; import org.elasticsearch.common.Strings; -import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.core.IOUtils; import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.cluster.FeatureFlag; @@ -309,20 +308,8 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase { getClusterStateFeatures(adminSearchClient), semanticNodeVersions ); - final TestFeatureService combinedTestFeatureService = new TestFeatureService() { - @Override - public boolean clusterHasFeature(String featureId) { - return testFeatureService.clusterHasFeature(featureId) && searchTestFeatureService.clusterHasFeature(featureId); - } - - @Override - public Set getAllSupportedFeatures() { - return Sets.intersection( - testFeatureService.getAllSupportedFeatures(), - searchTestFeatureService.getAllSupportedFeatures() - ); - } - }; + final TestFeatureService combinedTestFeatureService = featureId -> testFeatureService.clusterHasFeature(featureId) + && searchTestFeatureService.clusterHasFeature(featureId); final Set combinedOsSet = Stream.concat(osSet.stream(), Stream.of(searchOs)).collect(Collectors.toSet()); final Set combinedNodeVersions = Stream.concat(nodesVersions.stream(), searchNodeVersions.stream()) .collect(Collectors.toSet()); diff --git a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java index ce11112bd441..5a58f3629df1 100644 --- a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java +++ b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java @@ -24,7 +24,6 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.core.IOUtils; import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.cluster.FeatureFlag; @@ -294,20 +293,9 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase { getClusterStateFeatures(adminSearchClient), semanticNodeVersions ); - final TestFeatureService combinedTestFeatureService = new TestFeatureService() { - @Override - public boolean clusterHasFeature(String featureId) { - return testFeatureService.clusterHasFeature(featureId) && searchTestFeatureService.clusterHasFeature(featureId); - } + final TestFeatureService combinedTestFeatureService = featureId -> testFeatureService.clusterHasFeature(featureId) + && searchTestFeatureService.clusterHasFeature(featureId); - @Override - public Set getAllSupportedFeatures() { - return Sets.intersection( - testFeatureService.getAllSupportedFeatures(), - searchTestFeatureService.getAllSupportedFeatures() - ); - } - }; final Set combinedOsSet = Stream.concat(osSet.stream(), Stream.of(searchOs)).collect(Collectors.toSet()); final Set combinedNodeVersions = Stream.concat(nodesVersions.stream(), searchNodeVersions.stream()) .collect(Collectors.toSet()); diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java index eff9dfc55413..c57112d0455c 100644 --- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java +++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java @@ -21,13 +21,13 @@ import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.cluster.util.Version; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ObjectPath; +import org.elasticsearch.test.rest.TestFeatureService; import org.junit.AfterClass; import org.junit.Before; import java.util.Arrays; import java.util.Locale; import java.util.Map; -import java.util.Set; import static org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus.OLD; import static org.elasticsearch.upgrades.FullClusterRestartUpgradeStatus.UPGRADED; @@ -42,7 +42,7 @@ public abstract class ParameterizedFullClusterRestartTestCase extends ESRestTest private static boolean upgradeFailed = false; private static boolean upgraded = false; - private static Set oldClusterFeatures; + private static TestFeatureService oldClusterTestFeatureService; private final FullClusterRestartUpgradeStatus requestedUpgradeStatus; public ParameterizedFullClusterRestartTestCase(@Name("cluster") FullClusterRestartUpgradeStatus upgradeStatus) { @@ -55,11 +55,10 @@ public abstract class ParameterizedFullClusterRestartTestCase extends ESRestTest } @Before - public void extractOldClusterFeatures() { - if (upgraded == false && oldClusterFeatures == null) { - assert testFeatureServiceInitialized() - : "Old cluster features can be extracted only after testFeatureService has been initialized. See ESRestTestCase#initClient"; - oldClusterFeatures = Set.copyOf(testFeatureService.getAllSupportedFeatures()); + public void retainOldClusterTestFeatureService() { + if (upgraded == false && oldClusterTestFeatureService == null) { + assert testFeatureServiceInitialized() : "testFeatureService must be initialized, see ESRestTestCase#initClient"; + oldClusterTestFeatureService = testFeatureService; } } @@ -124,7 +123,7 @@ public abstract class ParameterizedFullClusterRestartTestCase extends ESRestTest public static void resetUpgrade() { upgraded = false; upgradeFailed = false; - oldClusterFeatures = null; + oldClusterTestFeatureService = null; } public boolean isRunningAgainstOldCluster() { @@ -136,8 +135,9 @@ public abstract class ParameterizedFullClusterRestartTestCase extends ESRestTest } protected static boolean oldClusterHasFeature(String featureId) { - assert oldClusterFeatures != null : "Old cluster features cannot be accessed before initialization is completed"; - return oldClusterFeatures.contains(featureId); + assert oldClusterTestFeatureService != null + : "testFeatureService of old cluster cannot be accessed before initialization is completed"; + return oldClusterTestFeatureService.clusterHasFeature(featureId); } protected static boolean oldClusterHasFeature(NodeFeature feature) { diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml index 274fc92e64d2..466dcb838b5d 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/100_tsdb.yml @@ -1,8 +1,8 @@ --- setup: # Create a local tsdb index with a tsid the doesn't overlap with the remote cluster. - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -59,8 +59,8 @@ setup: --- teardown: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -70,8 +70,8 @@ teardown: --- aggregate tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml index ba4bf691f232..0ee9f19dd39d 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml @@ -107,8 +107,8 @@ --- "Get field caps from remote cluster with index filter": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: Index filter support was added in 7.9 - do: @@ -158,8 +158,8 @@ --- "Field caps with with include_empty_fields false": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: include_empty_fields has been added in 8.13.0 - do: indices.create: diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml index 8c59c0c7eaaf..c9e02c63fde7 100644 --- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml +++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml @@ -159,8 +159,8 @@ --- tsdb: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml b/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml index 22db10f32250..ce53526ab85e 100644 --- a/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml +++ b/qa/rolling-upgrade-legacy/src/test/resources/rest-api-spec/test/old_cluster/20_camel_case_on_format.yml @@ -1,9 +1,10 @@ --- "Create index with camel case on format (allowed with warning in 7.x)": - skip: - version: "8.0.0 - " + cluster_features: ["gte_v8.0.0"] reason: "at version 8.0.0, camel case is not allowed" - features: "warnings" + - requires: + test_runner_features: "warnings" - do: warnings: - "Camel case format name strictDateOptionalTime is deprecated and will be removed in a future version. Use snake case name strict_date_optional_time instead." @@ -41,10 +42,10 @@ --- "Create index with camel case on format (when bwc version is > 8.0.0)": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "at version 8.0.0, camel case is not allowed" - features: "warnings" + test_runner_features: "warnings" - do: indices.create: index: camel_case_on_format diff --git a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java index 1981b3e32cc3..63ed54d05adf 100644 --- a/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java +++ b/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java @@ -24,6 +24,7 @@ import org.elasticsearch.test.cluster.local.distribution.DistributionType; import org.elasticsearch.test.cluster.util.Version; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ObjectPath; +import org.elasticsearch.test.rest.TestFeatureService; import org.junit.AfterClass; import org.junit.Before; import org.junit.ClassRule; @@ -71,7 +72,7 @@ public abstract class ParameterizedRollingUpgradeTestCase extends ESRestTestCase } private static final Set upgradedNodes = new HashSet<>(); - private static final Set oldClusterFeatures = new HashSet<>(); + private static TestFeatureService oldClusterTestFeatureService = null; private static boolean upgradeFailed = false; private static IndexVersion oldIndexVersion; @@ -83,8 +84,8 @@ public abstract class ParameterizedRollingUpgradeTestCase extends ESRestTestCase @Before public void extractOldClusterFeatures() { - if (isOldCluster() && oldClusterFeatures.isEmpty()) { - oldClusterFeatures.addAll(testFeatureService.getAllSupportedFeatures()); + if (isOldCluster() && oldClusterTestFeatureService == null) { + oldClusterTestFeatureService = testFeatureService; } } @@ -149,7 +150,7 @@ public abstract class ParameterizedRollingUpgradeTestCase extends ESRestTestCase public static void resetNodes() { oldIndexVersion = null; upgradedNodes.clear(); - oldClusterFeatures.clear(); + oldClusterTestFeatureService = null; upgradeFailed = false; } @@ -159,8 +160,8 @@ public abstract class ParameterizedRollingUpgradeTestCase extends ESRestTestCase } protected static boolean oldClusterHasFeature(String featureId) { - assert oldClusterFeatures.isEmpty() == false; - return oldClusterFeatures.contains(featureId); + assert oldClusterTestFeatureService != null; + return oldClusterTestFeatureService.clusterHasFeature(featureId); } protected static boolean oldClusterHasFeature(NodeFeature feature) { diff --git a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml index c8ad5f18bc7c..aa2a49da8a78 100644 --- a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml +++ b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/20_tsdb_consistency.yml @@ -2,8 +2,8 @@ # rest-api-spec we would, but it requires painless. setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -67,8 +67,8 @@ setup: --- "index with replicas and shards is green": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -78,8 +78,8 @@ setup: --- "each shard has unique _tsids": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml index 92905243fdb1..2815dfd8ff0c 100644 --- a/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml +++ b/qa/smoke-test-multinode/src/yamlRestTest/resources/rest-api-spec/test/smoke_test_multinode/30_desired_balance.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "API added in in 8.6.0" --- @@ -67,8 +67,8 @@ setup: --- "Test cluster_balance_stats": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "cluster_balance_stats added in in 8.7.0" - do: @@ -115,8 +115,8 @@ setup: --- "Test tier_preference": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "tier_preference added in in 8.8.0" - do: @@ -140,8 +140,8 @@ setup: --- "Test cluster_info": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "cluster_info added in in 8.8.0" - do: @@ -152,8 +152,8 @@ setup: --- "Test undesired_shard_allocation_count": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "undesired_shard_allocation_count added in in 8.12.0" - do: @@ -190,8 +190,8 @@ setup: --- "Test unassigned_shards, total_allocations, undesired_allocations and undesired_allocations_fraction": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "undesired_shard_allocation_count added in in 8.12.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml index d0efcc0b6700..ac4d33f0b82e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/bulk/12_noop.yml @@ -1,7 +1,7 @@ --- "Noop": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: fixed in 8.14.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml index 6d8e1205867b..4f18b331325a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.allocation/10_basic.yml @@ -1,8 +1,8 @@ --- "Help": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast are added in 8.14.0" - do: @@ -29,8 +29,8 @@ --- "One index": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -70,8 +70,8 @@ --- "Node ID": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -110,8 +110,8 @@ --- "All Nodes": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -148,8 +148,8 @@ --- "Column headers": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -230,8 +230,8 @@ --- "Bytes": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "shards.undesired, write_load.forecast and disk.indices.forecast columns are added in 8.14.0" - do: @@ -281,8 +281,8 @@ --- "Node forecasts": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "write_load.forecast and disk.indices.forecast columns added in 8.14.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml index 2540451a716a..0ad514449167 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.templates/20_matching.yml @@ -134,8 +134,8 @@ setup: --- "Reject request containing comma": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "validation only added in 7.16.0" - do: catch: bad_request diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml index 7e08f2dbe542..1d1aa524ffb2 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "API added in in 8.1.0 but modified in 8.13 (node_version field removed)" --- teardown: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml index ed5ca16edad4..4df1252bef27 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml @@ -1,8 +1,11 @@ --- setup: - skip: - version: " - 8.2.99, 8.12.99 - " - reason: "API added in in 8.1.0, modified in 8.3 and then again in 8.13.0" + cluster_features: ["gte_v8.13.0"] + reason: "API modified in 8.3 8.13.0" + - requires: + cluster_features: ["gte_v8.3.0"] + reason: "API added in in 8.1.0 but modified in 8.3" --- teardown: - do: @@ -146,7 +149,7 @@ teardown: --- "Test settings are validated": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: cluster.state: {} @@ -172,7 +175,7 @@ teardown: --- "Test unknown settings are forbidden in known versions": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: cluster.state: {} @@ -198,7 +201,7 @@ teardown: --- "Test unknown settings are allowed in future versions": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: _internal.update_desired_nodes: @@ -211,7 +214,7 @@ teardown: --- "Test some settings can be overridden": - skip: - version: "8.9.99 - " + cluster_features: ["gte_v8.9.99"] reason: "We started skipping setting validations in 8.10" - do: cluster.state: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml index 56a693febec8..ac9a3437df0c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml @@ -10,8 +10,8 @@ teardown: --- "Test dry run doesn't update empty desired nodes": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "version_node removed from version 8.13 onwards, require the new api" - do: cluster.state: {} @@ -40,8 +40,8 @@ teardown: --- "Test dry run doesn't update existing desired nodes": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "version_node removed from version 8.13 onwards, require the new api" - do: cluster.state: {} @@ -120,8 +120,8 @@ teardown: - match: { error.suppressed.0.reason: "unknown setting [random_setting] please check that any required plugins are installed, or check the breaking changes documentation for removed settings" } --- "Test misspelled dry run": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "version_node removed from version 8.13 onwards" - do: cluster.state: { } diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml index 83f8aab34e02..303e4901476c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/delete/70_tsdb.yml @@ -1,7 +1,7 @@ --- "basic tsdb delete": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml index 55a5c26e5e5c..4dcec00650df 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.get_features/10_basic.yml @@ -1,8 +1,8 @@ --- "Get Features": - - skip: - features: contains - version: " - 7.11.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v7.12.0"] reason: "This API was added in 7.12.0" - do: { features.get_features: {}} - contains: {'features': {'name': 'tasks'}} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml index 5bdd6852412a..e21703f8f26f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/features.reset_features/10_basic.yml @@ -1,8 +1,8 @@ --- "Get Features": - - skip: - features: contains - version: " - 7.12.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v7.13.0"] reason: "This API was added in 7.13.0" - do: { features.get_features: {}} - contains: {'features': {'name': 'tasks'}} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml index ad641f83b47a..14e827bbd2ad 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/10_basic.yml @@ -164,8 +164,8 @@ setup: --- "Get field caps with fields in body": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: re-added support for fields in the request body in 8.5 - do: field_caps: @@ -229,8 +229,8 @@ setup: --- "Field caps for number field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -241,8 +241,8 @@ setup: --- "Field caps for date field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -253,8 +253,8 @@ setup: --- "Field caps for keyword field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -265,8 +265,8 @@ setup: --- "Field caps for boolean field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -277,8 +277,8 @@ setup: --- "Field caps for ip field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -289,8 +289,8 @@ setup: --- "Field caps for geo_point field with only doc values": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: field_caps: @@ -397,8 +397,8 @@ setup: --- "Field caps with include_unmapped": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: include_unmapped has been added in 7.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml index e1b7cc3abfa4..8089102edb75 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/20_meta.yml @@ -1,7 +1,7 @@ --- "Merge metadata across multiple indices": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: Metadata support was added in 7.6 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml index 31e8661c9e47..a5b8d507999c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/30_index_filter.yml @@ -59,8 +59,8 @@ setup: --- "Field caps with index filter": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: Index filter support was added in 7.9 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml index e0d4b19a1a22..2d43d22da4cc 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/40_time_series.yml @@ -105,8 +105,8 @@ setup: --- "Get simple time series field caps": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -167,8 +167,8 @@ setup: --- "Get time series field caps with conflicts": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml index 24fe21a169f2..293ec40ea2b8 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/field_caps/60_non_empty_fields.yml @@ -22,8 +22,8 @@ setup: --- "Field caps with with include_empty_fields false": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: include_empty_fields has been added in 8.13.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml index b0149160b9f5..4133a13ebd7d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -37,8 +37,8 @@ keyword: --- fetch without refresh also produces synthetic source: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -82,8 +82,8 @@ fetch without refresh also produces synthetic source: --- force_synthetic_source_ok: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -131,8 +131,8 @@ force_synthetic_source_ok: --- force_synthetic_source_bad_mapping: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -175,8 +175,8 @@ force_synthetic_source_bad_mapping: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -248,8 +248,8 @@ stored text: --- stored keyword: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -289,8 +289,8 @@ stored keyword: --- doc values keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -372,8 +372,8 @@ doc values keyword with ignore_above: --- stored keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -457,8 +457,8 @@ stored keyword with ignore_above: --- indexed dense vectors: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -501,8 +501,8 @@ indexed dense vectors: --- non-indexed dense vectors: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -544,8 +544,8 @@ non-indexed dense vectors: --- _source filtering: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -586,8 +586,8 @@ _source filtering: --- _doc_count: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: introduced in 8.6.0 - do: @@ -715,8 +715,8 @@ _doc_count: --- ip with ignore_malformed: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: introduced in 8.6.0 - do: @@ -812,8 +812,8 @@ ip with ignore_malformed: --- flattened field: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: support for synthetic source on flattened fields added in 8.8.0 - do: @@ -904,8 +904,8 @@ flattened field: --- flattened field no doc values: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: support for synthetic source on flattened fields added in 8.8.0 - do: @@ -923,8 +923,8 @@ flattened field no doc values: --- flattened field with ignore_above: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: support for synthetic source on flattened fields added in 8.8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml index ffb1e3861a61..ddfdc69af1b4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/110_ignore_malformed.yml @@ -1,7 +1,7 @@ --- ip: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml index d718a5a9704d..736fc7dd53d2 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/70_require_alias.yml @@ -1,7 +1,7 @@ --- "Set require_alias flag": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "require_alias flag added in 7.10" - do: catch: missing diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml index 4e552f8441d5..8915d41f7030 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/80_date_nanos.yml @@ -1,8 +1,8 @@ --- "date_nanos requires dates after 1970 and before 2262": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: error message changed in 8.8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml index 87f40553617e..50a74610cdf4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/90_geo_point.yml @@ -39,8 +39,8 @@ --- "null value in array": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: fixed in 8.3.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml index 4e4b20a22d51..94c19a4d69e1 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml @@ -1,8 +1,8 @@ --- "Metrics object indexing": - - skip: - features: allowed_warnings_regex - version: " - 8.2.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.3.0"] reason: added in 8.3.0 - do: @@ -64,9 +64,9 @@ --- "Root without subobjects": - - skip: - features: allowed_warnings_regex - version: " - 8.2.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.3.0"] reason: added in 8.3.0 - do: @@ -123,9 +123,9 @@ --- "Metrics object indexing with synthetic source": - - skip: - features: allowed_warnings_regex - version: " - 8.3.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.4.0"] reason: added in 8.4.0 - do: @@ -190,9 +190,9 @@ --- "Root without subobjects with synthetic source": - - skip: - features: allowed_warnings_regex - version: " - 8.3.99" + - requires: + test_runner_features: allowed_warnings_regex + cluster_features: ["gte_v8.4.0"] reason: added in 8.4.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml index b7e84d2fd526..68fcac8126c6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.blocks/10_basic.yml @@ -1,7 +1,7 @@ --- "Basic test for index blocks": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "index block APIs have only been made available in 7.9.0" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml index d5007d29f371..6072096257c3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/10_basic.yml @@ -28,8 +28,8 @@ setup: --- "Clone index via API": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 # make it read-only - do: @@ -84,8 +84,8 @@ setup: --- "Create illegal clone indices": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 # try to do an illegal clone with illegal number_of_shards - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml index 625f574fa73d..2c3ba97f0d29 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/20_source_mapping.yml @@ -1,7 +1,7 @@ --- "Clone index ignores target template mapping": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 # create index - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml index 503cc1560907..74e431860be6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.clone/30_copy_settings.yml @@ -1,9 +1,9 @@ --- "Copy settings during clone index": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: index cloning was added in 7.4.0 - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml index 9a59773893d6..20ffc0c89e5a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml @@ -135,8 +135,8 @@ --- "Create with alias containing date math": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "date math support for aliases was added in 7.13" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml index b4e5507f42be..62a4e240a5b5 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml @@ -1,6 +1,6 @@ invalid: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: @@ -18,8 +18,8 @@ invalid: --- nested is disabled: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: introduced in 8.3.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml index 15b49e8d2fbe..e5f48f49c697 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/30_dynamic_template.yml @@ -23,8 +23,8 @@ --- "Create index with dynamic_mappings, using lists for some match/unmatch sections": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: Arrays in dynamic templates added in 8.9 - do: indices.create: @@ -62,8 +62,8 @@ --- "Create index with dynamic_mappings, with wildcard match_mapping_type and an unmatch_mapping_type array": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: unmatch_mapping_type in dynamic templates added in 8.13 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml index 6df2b6acf4e5..290d1cb0ac04 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.flush/10_basic.yml @@ -28,8 +28,8 @@ --- "Flush parameters validation": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: flush parameters validation is introduced in 7.2.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml index ace4c1703e63..e884ff28a7ef 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml @@ -11,8 +11,8 @@ --- "Force merge with incompatible only_expunge_deletes and max_num_segments values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: only_expunge_deletes and max_num_segments are mutually exclusive since 8.0 - do: @@ -32,8 +32,8 @@ --- "Force merge with wait_for_completion parameter": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: wait_for_completion is introduced since 8.1 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml index c64b872c3e8a..e2fd28e745f0 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get/10_basic.yml @@ -172,8 +172,8 @@ setup: --- "Should return only selected features": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "features option added in 8.1.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml index 1878ae099764..b077cbe98b28 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml @@ -54,9 +54,9 @@ setup: --- "Get field mapping with local parameter should fail": - - skip: - features: ["warnings"] - version: " - 7.99.99" + - requires: + test_runner_features: ["warnings"] + cluster_features: ["gte_v8.0.0"] reason: "local parameter for get field mapping API was allowed before v8" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml index 75a80f94c62b..577665486da6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/10_basic.yml @@ -181,8 +181,8 @@ setup: --- "Get index template always shows composed_of": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "A bug was fixed in 8.13.0 to make `composed_of` always returned" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml index b9fa29297b48..2edb26755a56 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_index_template/20_get_missing.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -10,8 +10,8 @@ setup: --- "Get missing template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -23,8 +23,8 @@ setup: --- "Get non-matching wildcard": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -37,8 +37,8 @@ setup: --- "Reject request containing comma": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "validation only added in 7.16.0" - do: catch: bad_request diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml index c6ff83345c6a..853837f1375f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml @@ -125,8 +125,8 @@ setup: ignore_unavailable: true --- "Get test-* with wildcard_expansion=none ignore_unavailable=false": - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: "bug fixed in 8.6" - do: catch: missing diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml index 76dfa552b563..9101475fc905 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.open/10_basic.yml @@ -69,8 +69,8 @@ --- "Close index with wait_for_active_shards set to all": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "closed indices are replicated starting version 7.2.0" - do: @@ -124,10 +124,10 @@ --- "?wait_for_active_shards=index-setting is deprecated": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "required deprecation warning is only emitted in 8.0 and later" - features: ["warnings"] + test_runner_features: ["warnings"] - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml index efeb97aa9ec0..61c7561c3c43 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_alias/10_basic.yml @@ -79,8 +79,8 @@ --- "Can create filtered alias with a date_nanos range query": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "skipping older version until backport" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml index 561a9dfc9b39..81068f460b2b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/10_basic.yml @@ -1,9 +1,9 @@ --- "Put index template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -32,10 +32,10 @@ --- "Put multiple index templates": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -72,10 +72,10 @@ --- "Put index template with 'create' flag": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -110,8 +110,8 @@ --- "Put index template without index_patterns": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - do: @@ -122,10 +122,10 @@ --- "Delete multiple templates": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "not yet backported" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml index 890162787f04..280a645318dd 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/15_composition.yml @@ -1,9 +1,9 @@ --- "Component and index template composition": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -87,10 +87,10 @@ --- "Index template priority": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -130,10 +130,10 @@ --- "Component template only composition": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -175,10 +175,10 @@ --- "Index template without component templates": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "index template v2 API unavailable before 7.8" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -203,10 +203,10 @@ --- "Index template mapping merging": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "index template v2 mapping merging not available before 7.9" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -289,10 +289,10 @@ --- "Index template ignore_missing_component_template valid": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "index template v2 ignore_missing_component_template config not available before 8.7" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: @@ -326,10 +326,10 @@ --- "Index template ignore_missing_component_template invalid": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "index template v2 ignore_missing_component_template config not available before 8.7" - features: allowed_warnings + test_runner_features: allowed_warnings - do: cluster.put_component_template: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml index d7731c007314..06865d2f620e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.recovery/10_basic.yml @@ -43,10 +43,10 @@ --- "Indices recovery test for closed index": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: closed indices are replicated starting version 7.2.0 - features: ["allowed_warnings"] + test_runner_features: ["allowed_warnings"] - do: indices.create: @@ -137,8 +137,8 @@ - match: { $body: {} } --- "Indices recovery test with detailed parameter": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: bug with detailed parameter fixed in 7.3 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml index f35ade2b3cb1..ba341e0d220e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/10_basic_resolve_cluster.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: @@ -25,8 +25,8 @@ setup: --- "Resolve cluster with indices and aliases": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -51,8 +51,8 @@ setup: --- "Resolve cluster with closed index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -86,8 +86,8 @@ setup: --- "Resolve cluster using alias": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -110,8 +110,8 @@ setup: --- "Resolve cluster using alias and index that does not exist": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: @@ -136,8 +136,8 @@ setup: --- "Test resolve cluster optional params are accepted": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml index 796034525e6e..0773d5875848 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_cluster/20_resolve_system_index.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster introduced in 8.13" - features: "warnings" + test_runner_features: "warnings" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml index cb06911a4fa3..f7252d0a9a89 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/10_basic_resolve_index.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index introduced in 7.9" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: @@ -36,8 +36,8 @@ setup: --- "Resolve index with indices and aliases": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index introduced in 7.9" - do: @@ -64,8 +64,8 @@ setup: --- "Resolve index with hidden and closed indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "resolve index introduced in 7.9" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml index 316cefb250d4..56e630549327 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/20_resolve_system_index.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "system index attribute introduced in 8.2" - features: "warnings" + test_runner_features: "warnings" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml index fd7d4c5b857a..a53365721cf0 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/10_basic.yml @@ -151,8 +151,8 @@ --- "Will not rollover with only min_* conditions": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml index 36d33175881f..d2710ebd057c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/25_max_shard_doc_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with max_primary_shard_docs condition": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml index 1f07d9fff713..e608a272539c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/35_max_primary_shard_size_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with max_primary_shard_size condition": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_primary_shard_size condition was introduced in 7.12.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml index 125d00b2faff..334a5e37c935 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/50_min_age_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_age condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml index 99fa37ecfdcb..45bc360e29e4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/55_min_docs_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_docs condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml index c4226590d70f..c6256ec2babb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/60_min_primary_shard_docs_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_primary_shard_docs condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml index fde9b8c5a922..983bd9fa442f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/65_min_primary_shard_size_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_primary_shard_size condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml index 400858d7942a..71023f55f9ca 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.rollover/70_min_size_condition.yml @@ -1,7 +1,7 @@ --- "Rollover with min_size condition": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 # create index with alias and replica diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml index 4950f9bbf2dc..6790014be995 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_index_template/10_basic.yml @@ -1,9 +1,9 @@ --- "Simulate index template without new template in the body": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -30,10 +30,10 @@ --- "Simulate index template specifying a new template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -85,10 +85,10 @@ --- "Simulate index template with index not matching any template": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -115,10 +115,10 @@ --- "Simulate index matches overlapping legacy and composable templates": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "simulate index template API is only in 7.8.0+" - features: ["allowed_warnings", "default_shards"] + test_runner_features: ["allowed_warnings", "default_shards"] - do: indices.put_template: @@ -178,10 +178,10 @@ --- "Simulate an index for and index or alias that already exists": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "simulating index template API for an existing index has not yet been backported" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -226,10 +226,10 @@ --- "Simulate index template with lifecycle and include defaults": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Data stream lifecycle with effective retention was released in 8.14" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml index 2e27a694f470..ff53a762b75e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.simulate_template/10_basic.yml @@ -1,9 +1,9 @@ --- "Simulate template without a template in the body": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "only available in 7.9+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -30,10 +30,10 @@ --- "Simulate index template specifying a new template": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "only available in 7.9+" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: @@ -84,10 +84,10 @@ --- "Simulate template matches overlapping legacy and composable templates": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "only available in 7.9+" - features: ["allowed_warnings", "default_shards"] + test_runner_features: ["allowed_warnings", "default_shards"] - do: indices.put_template: @@ -147,10 +147,10 @@ --- "Simulate replacing a template with a newer version": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "not yet backported" - features: ["allowed_warnings", "default_shards"] + test_runner_features: ["allowed_warnings", "default_shards"] - do: indices.put_index_template: @@ -201,10 +201,10 @@ --- "Simulate template with lifecycle and include defaults": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Data stream lifecycle with effective retention was released in 8.14" - features: ["default_shards"] + test_runner_features: ["default_shards"] - do: indices.put_index_template: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml index 97616684e70f..bec1bfba0d1b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/10_basic.yml @@ -95,8 +95,8 @@ setup: --- "Split from 1 to N": - - skip: - version: " - 6.99.99" + - requires: + cluster_features: ["gte_v7.0.0"] reason: automatic preparation for splitting was added in 7.0.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml index 3de89793a1b0..38bf9d72ef8f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.split/50_routing_required.yml @@ -99,8 +99,8 @@ routing required: --- nested: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "fixed in 8.5.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml index 226458ce475b..d0ff1dbf69f3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/100_search_idle.yml @@ -14,8 +14,8 @@ setup: --- "Search idle stats": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "search idle stats added in 8.9.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml index 49f57ac5df03..75d41be06d4d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/20_translog.yml @@ -51,8 +51,8 @@ --- "Translog retention settings are no long supported": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "translog retention settings are no longer supported in 8.0" - do: catch: /illegal_argument_exception/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml index 72fab59cc6cd..6e827ef92982 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/30_segments.yml @@ -15,8 +15,8 @@ setup: --- "Segment Stats": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: forbid_closed_indices is not supported in ealier version - do: @@ -66,8 +66,8 @@ setup: --- "Indices Stats API with extended files stats": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: segment files stats extended in 7.13.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml index 3fe6edf0823e..089d8e339b4f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/50_disk_usage.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: analyze index disk usage API is introduced in 7.15 - do: @@ -110,8 +110,8 @@ setup: --- "Star": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: star is resolved in 8.2+ - do: @@ -130,8 +130,8 @@ setup: --- "Dense vectors": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: dense vector support was added in 8.4 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml index be2eaf518181..ce5d93a8eb38 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/70_write_load.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.5.99" + - requires: + cluster_features: ["gte_v8.6.0"] reason: Indices write load stats were introduced in 8.6 --- "Write load average is tracked at shard level": diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml index 692728348feb..6b01a9fe50cf 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/90_global_ordinals.yml @@ -54,8 +54,8 @@ setup: --- "global_ordinals - blank": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: @@ -69,8 +69,8 @@ setup: --- "global_ordinals - fields": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: @@ -124,8 +124,8 @@ setup: --- "global_ordinals - fields and metrics": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: @@ -163,8 +163,8 @@ setup: --- "global_ordinals - fielddata_fields": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "global_ordinals introduced in 8.8.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml index 484934c21209..95b1fbd7c041 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml @@ -169,8 +169,8 @@ --- "Aliases with date math": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "date math support for aliases was added in 7.13" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml index fa3c74061287..0c4f90ea7334 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.update_aliases/40_must_exist.yml @@ -1,8 +1,8 @@ --- "Remove alias with must_exist": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "must_exist does not work until 7.11" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml index dc6e73024886..8dfd499b7d32 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml @@ -155,8 +155,8 @@ --- "Test Get Summarized Pipelines": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "summary option added in 7.13" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml index 8e0bd87905e0..7c8061e36e79 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml @@ -1,7 +1,7 @@ --- "Multi Get with alias that resolves to multiple indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "message was changed to fix grammar in 7.9" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml index 7a2706ffe386..50482aa6f86f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/40_routing.yml @@ -35,8 +35,8 @@ routing: --- requires routing: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "fails with an unexpected message in 7.x" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml index 39cf7ba41d46..2935c0c1c41b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -48,8 +48,8 @@ keyword: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -97,8 +97,8 @@ stored text: --- force_synthetic_source_ok: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -161,8 +161,8 @@ force_synthetic_source_ok: --- force_synthetic_source_bad_mapping: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: message changed in 8.5 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml index c4d48933aae7..13d98aab2d1d 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/10_get_feature_upgrade_status.yml @@ -1,7 +1,7 @@ "Get feature upgrade status": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Endpoint added in 7.16.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml index c2a99fdcde77..b1d6b0630d0a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/migration/20_post_feature_upgrade.yml @@ -1,7 +1,7 @@ "Get feature upgrade status": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: "Endpoint added in 7.16.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml index a9e1893ea764..ba88ed8104f3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mtermvectors/30_routing.yml @@ -41,8 +41,8 @@ routing: --- requires routing: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "fails with an unexpected message in 7.x" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml index df5e04a942d1..94064ab1953b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/10_basic.yml @@ -13,10 +13,10 @@ setup: --- "node_info role test": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "node roles were not sorted before 7.8.0" - features: [no_xpack] + test_runner_features: [no_xpack] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml index 415121823adf..b7a9356ee2db 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.info/40_aggs.yml @@ -1,9 +1,9 @@ --- "node_info test aggregations": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "aggregation info only supported in 7.9.10+" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml index e96df35d5714..ce8fdb7e5cef 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.reload_secure_settings/10_basic.yml @@ -3,8 +3,8 @@ setup: features: [arbitrary_key] --- "node_reload_secure_settings test wrong password": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "support for reloading password protected keystores was introduced in 7.7.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml index b119a1a1d94f..1a7da98af912 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml @@ -234,9 +234,9 @@ --- "Metric - segments include_unloaded_segments": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "support for include_unloaded_segments only added in 7.13" - do: nodes.info: {} @@ -266,9 +266,9 @@ --- "Metric - _all include_unloaded_segments": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "support for include_unloaded_segments only added in 7.13" - do: nodes.info: {} @@ -296,9 +296,9 @@ --- "Metric - http": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "HTTP client stats added in 7.13.0" - do: nodes.info: {} @@ -327,9 +327,9 @@ --- "Metric - blank for indices shard_stats": - - skip: - features: [arbitrary_key] - version: " - 7.15.0" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.15.1"] reason: "total shard count added in version 7.15.0, and fixed in 7.15.1" - do: nodes.info: {} @@ -344,9 +344,9 @@ --- "Metric - _all for indices shard_stats": - - skip: - features: [arbitrary_key] - version: " - 7.15.0" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.15.1"] reason: "total shard count added in version 7.15.0, and fixed in 7.15.1" - do: nodes.info: {} @@ -363,9 +363,9 @@ --- "indices shard_stats total count test": - - skip: - features: ["allowed_warnings", arbitrary_key] - version: " - 7.15.0" + - requires: + test_runner_features: ["allowed_warnings", arbitrary_key] + cluster_features: ["gte_v7.15.1"] reason: "total shard count added in version 7.15.0, and fixed in 7.15.1" - do: @@ -396,9 +396,9 @@ --- "Metric - blank for indices mappings": - - skip: - features: [arbitrary_key] - version: " - 8.4.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v8.5.0"] reason: "mappings added in version 8.5.0" - do: nodes.info: {} @@ -415,9 +415,9 @@ --- "indices mappings exact count test for indices level": - - skip: - features: [arbitrary_key] - version: " - 8.4.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v8.5.0"] reason: "mappings added in version 8.5.0" - do: @@ -509,9 +509,9 @@ --- "indices mappings does not exist in shards level": - - skip: - features: [arbitrary_key] - version: " - 8.4.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v8.5.0"] reason: "mappings added in version 8.5.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml index 5c416c4f9e84..e18e47765841 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/40_store_stats.yml @@ -1,8 +1,8 @@ --- "Store stats": - - skip: - features: [arbitrary_key] - version: " - 7.12.99" + - requires: + test_runner_features: [arbitrary_key] + cluster_features: ["gte_v7.13.0"] reason: "total_data_set_size added in 7.13" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml index c08f8579e6ec..de8167ee71e8 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml @@ -1,9 +1,9 @@ --- "Indexing pressure stats": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "indexing_pressure was added in 7.9" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} @@ -31,10 +31,10 @@ - gte: { nodes.$node_id.indexing_pressure.memory.total.replica_rejections: 0 } --- "Indexing pressure memory limit": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "memory limit was added in 7.10" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml index 4ce6198a11f4..175b66bafea5 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/60_transport_stats.yml @@ -23,10 +23,10 @@ --- "Transport handling time histogram": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "handling_time_histograms were added in 8.1" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml index 1e8dc106092b..0731d6a5dcf4 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/70_repository_throttling_stats.yml @@ -1,9 +1,9 @@ --- "Repository throttling stats (no repository exists)": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "repository throttling stats was added in 8.9.0" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} @@ -19,10 +19,10 @@ --- "Repository throttling stats (some repositories exist)": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: "repository throttling stats was added in 8.9.0" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml index a2e1117073cd..b2f5acd1507b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/80_allocation_stats.yml @@ -1,9 +1,9 @@ --- "Allocation stats": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "allocation stats was added in 8.14.0" - features: [arbitrary_key] + test_runner_features: [arbitrary_key] - do: nodes.info: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml index f3cb3f7810e3..48ad549e9405 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/range/10_basic.yml @@ -392,8 +392,8 @@ setup: --- "Date range rounding": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "This part tests rounding behaviour changed in 7.7" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml index 64efeb7dfb4b..5b8bb7f06a38 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/20_get_script_context.yml @@ -1,6 +1,6 @@ "Action to get all contexts": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: "get_all_contexts introduced in 7.6.0" - do: get_script_context: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml index f4d764324e2d..855e2c161dff 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/scripts/25_get_script_languages.yml @@ -1,6 +1,6 @@ "Action to get script languages": - - skip: - version: " - 7.6.0" + - requires: + cluster_features: ["gte_v7.6.1"] reason: "get_script_languages introduced in 7.6.0" - do: get_script_languages: {} diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml index 4607ae758b91..a26bc22df893 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/10_unified.yml @@ -25,8 +25,8 @@ setup: --- teardown: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "setting added in 8.10.0" - do: @@ -49,8 +49,8 @@ teardown: --- "Basic combined_fields query": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "combined fields query was introduced in 7.13" - do: search: @@ -64,8 +64,8 @@ teardown: --- "Disable weight matches": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml index a832ca222288..cba72e6b5e8e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/20_fvh.yml @@ -69,8 +69,8 @@ setup: --- "Highlight multiple documents": - - skip: - version: " - 7.10.1" + - requires: + cluster_features: ["gte_v7.10.2"] reason: Bug fixed in 7.10.2 - do: search: @@ -93,8 +93,8 @@ setup: --- "Highlight multiple nested documents": - - skip: - version: " - 7.10.1" + - requires: + cluster_features: ["gte_v7.10.2"] reason: Bug fixed in 7.10.2 - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml index edc69b4e22a3..d732fb084db3 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml @@ -40,8 +40,8 @@ setup: --- "Unified highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: @@ -66,8 +66,8 @@ setup: --- "Plain highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: @@ -103,8 +103,8 @@ setup: --- "Plain highlighter on a field WITH OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: @@ -117,8 +117,8 @@ setup: --- "Plain highlighter with max_analyzed_offset < 0 should FAIL": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: max_analyzed_offset query param added in 7.12.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml index 5849ed195265..bad4247b35ee 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/40_keyword_ignore.yml @@ -25,8 +25,8 @@ setup: --- "Plain Highligher should skip highlighting ignored keyword values": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "skip highlighting of ignored values was introduced in 7.7" - do: search: @@ -46,8 +46,8 @@ setup: --- "Unified Highligher should skip highlighting ignored keyword values": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "skip highlighting of ignored values was introduced in 7.7" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml index 26e2eff5c3d3..a2fd448f5044 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.highlight/50_synthetic_source.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -199,8 +199,8 @@ text multi plain: --- text single unified from reanalysis: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -218,8 +218,8 @@ text single unified from reanalysis: --- text multi unified from reanalysis: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -237,8 +237,8 @@ text multi unified from reanalysis: --- text single unified from positions: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -256,8 +256,8 @@ text single unified from positions: --- text multi unified from positions: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -275,8 +275,8 @@ text multi unified from positions: --- text single unified from vectors: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -294,8 +294,8 @@ text single unified from vectors: --- text multi unified from vectors: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -313,8 +313,8 @@ text multi unified from vectors: --- text single fvh source order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -332,8 +332,8 @@ text single fvh source order: --- text multi fvh source order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -351,8 +351,8 @@ text multi fvh source order: --- text single fvh score order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: @@ -371,8 +371,8 @@ text single fvh score order: --- text multi fvh score order: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "support for weight matches was added in 8.10" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml index 136dc807a89d..43d820e03481 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/70_dense_vector_telemetry.yml @@ -41,8 +41,8 @@ setup: --- "Field mapping stats": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "Cluster mappings stats for indexed dense vector was added in 8.4" - do: { cluster.stats: { } } - length: { indices.mappings.field_types: 1 } diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml index 7b8ce0b961b9..fa89a4356176 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/90_sparse_vector.yml @@ -1,8 +1,8 @@ --- "Indexing and searching sparse vectors in >=8.11": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "sparse_vector field type reintroduced in 8.11" - do: @@ -151,9 +151,10 @@ --- "Sparse vector in 7.x": + - requires: + test_runner_features: ["allowed_warnings"] - skip: - features: ["allowed_warnings"] - version: "8.0.0 - " + cluster_features: ["gte_v8.0.0"] reason: "sparse_vector field type supported in 7.x" - do: allowed_warnings: @@ -183,7 +184,10 @@ --- "Sparse vector in 8.0.0 <= x < 8.11.0": - skip: - version: " - 7.99.99, 8.11.0 - " + cluster_features: ["gte_v8.11.0"] + reason: "sparse_vector field type not supported in 8.x until 8.11.0" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "sparse_vector field type not supported in 8.x until 8.11.0" - do: catch: /The \[sparse_vector\] field type .* supported/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml index 4f79cbabbbeb..76207fd76e45 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml @@ -517,8 +517,8 @@ setup: - gte: { hits.hits.2.inner_hits.sub_hits.hits.hits.1._primary_term: 1 } --- "Test collapse with inner_hits and missing name fails": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: fixed in 8.13 - do: catch: bad_request diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml index fc63ac5c5876..3c0364bb7834 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/111_field_collapsing_with_max_score.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Collapse with max score was fixed in 8.10.0 - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml index 4dfba3652d7d..9a9fbdfe4519 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/161_exists_query_within_nested_query.yml @@ -539,8 +539,8 @@ setup: --- "Test exists query within nested query on mapped binary field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -558,8 +558,8 @@ setup: --- "Test exists query within nested query on mapped boolean field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -577,8 +577,8 @@ setup: --- "Test exists query within nested query on mapped date field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -596,8 +596,8 @@ setup: --- "Test exists query within nested query on mapped geo_point field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -616,8 +616,8 @@ setup: --- "Test exists query within nested query on mapped ip field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -635,8 +635,8 @@ setup: --- "Test exists query within nested query on mapped keyword field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -654,8 +654,8 @@ setup: --- "Test exists query within nested query on mapped byte field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -673,8 +673,8 @@ setup: --- "Test exists query within nested query on mapped double field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -692,8 +692,8 @@ setup: --- "Test exists query within nested query on mapped float field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -711,8 +711,8 @@ setup: --- "Test exists query within nested query on mapped half_float field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -730,8 +730,8 @@ setup: --- "Test exists query within nested query on mapped integer field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -749,8 +749,8 @@ setup: --- "Test exists query within nested query on mapped long field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -768,8 +768,8 @@ setup: --- "Test exists query within nested query on mapped short field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -787,8 +787,8 @@ setup: --- "Test exists query within nested query on mapped object field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: @@ -806,8 +806,8 @@ setup: --- "Test exists query within nested query on mapped object inner field with no doc values": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "Fixed in 7.16 (backport pending)" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml index b08f532585fd..3304e1115416 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/200_ignore_malformed.yml @@ -92,8 +92,8 @@ setup: --- "ignored_field_values is returned by default": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: ignored_field_values was added in 8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml index 0f352de9c414..d8119c96853c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/220_total_hits_object.yml @@ -55,8 +55,8 @@ setup: --- "hits.total as an object": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: hits.total is rendered as an object in 7.0.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml index ea29e5b208b2..82fb18a87934 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/230_interval_query.yml @@ -322,8 +322,8 @@ setup: --- "Test overlapping": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: @@ -345,8 +345,8 @@ setup: --- "Test before": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: @@ -365,8 +365,8 @@ setup: --- "Test after": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: search: @@ -386,8 +386,8 @@ setup: --- "Test prefix": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "Implemented in 7.3" - do: search: @@ -406,8 +406,8 @@ setup: --- "Test wildcard": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "Implemented in 7.3" - do: search: @@ -426,8 +426,8 @@ setup: --- "Test fuzzy match": - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: "Implemented in 7.6" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml index f35bf691fbdc..a3f5517e29f0 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/240_date_nanos.yml @@ -137,8 +137,8 @@ setup: --- "date histogram aggregation with date and date_nanos mapping": - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: calendar_interval introduced in 7.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml index e00d7bbb7236..f55248eb5411 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/250_distance_feature.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "Implemented in 7.2" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml index 286e203ef5c7..bea52c22e151 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/30_limits.yml @@ -28,8 +28,8 @@ setup: --- "Request with negative from value url parameter": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: change was only made in 8.0.0 - do: @@ -42,8 +42,8 @@ setup: --- "Request with negative from value in body": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: change was only made in 8.0.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml index d0b4246ca4b8..0ea884164292 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/310_match_bool_prefix.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.1.99" + - requires: + cluster_features: ["gte_v7.2.0"] reason: "added in 7.2.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml index b301d64eb834..dcb265bcd98b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/320_disallow_queries.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -34,8 +34,8 @@ setup: --- teardown: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" - do: @@ -46,8 +46,8 @@ teardown: --- "Test disallow expensive queries": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "implemented in 7.7.0" ### Check for initial setting = null -> false diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml index 03a2129c7659..fd3d31f8245e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/330_fetch_fields.yml @@ -90,8 +90,8 @@ --- "Test disable source": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: "behaviour of fields when source is disabled changed in 8.4.0" - do: @@ -263,8 +263,8 @@ --- "Test token count": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "support for token_count was instroduced in 7.10" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml index b461a6c4defb..ea919ba3fd4f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/340_flattened.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "Flattened fields were moved from xpack to core in 7.13." --- @@ -183,8 +183,8 @@ setup: --- "Test fetching flattened subfields via fields option": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: fetching flattened subfields introduced in 7.13.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml index d58e1f7dc2c1..e53ef79b0627 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_binary_field.yml @@ -1,8 +1,8 @@ --- "binary": - - skip: - features: ["headers"] - version: " - 7.99.99" + - requires: + test_runner_features: ["headers"] + cluster_features: ["gte_v8.0.0"] reason: "docvalues_fields on binary field were corrected in 8.0" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml index 71ea09d33e81..da20c3f937dc 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/350_point_in_time.yml @@ -40,8 +40,8 @@ setup: --- "basic": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "point in time is introduced in server in 7.13" - do: open_point_in_time: @@ -139,8 +139,8 @@ setup: --- "point-in-time with slicing": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "support for slicing was added in 7.15" - do: open_point_in_time: @@ -169,8 +169,8 @@ setup: --- "wildcard": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "point in time is introduced in 7.10" - do: open_point_in_time: @@ -204,8 +204,8 @@ setup: --- "msearch": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "point in time is introduced in 7.10" - do: open_point_in_time: @@ -242,8 +242,8 @@ setup: --- "point-in-time with index filter": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "support for index filter was added in 8.12" - do: open_point_in_time: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml index 2b38a72c70a0..1ee1ab19f161 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/360_combined_fields.yml @@ -24,8 +24,8 @@ setup: --- "Test combined_fields query": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "combined fields query was introduced in 7.13" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml index 0ead7b87f8ac..201bba70ca5a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml @@ -467,10 +467,10 @@ dfs profile for search with dfs_query_then_fetch: - is_false: profile.shards.0.dfs --- composite_id_parsed: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: node_id, shard_id, index and cluster fields added in 8.10.0 - features: "contains" + test_runner_features: "contains" - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml index 04d6f7217502..34852a7b4962 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/380_sort_segments_on_timestamp.yml @@ -1,9 +1,9 @@ --- "Test that index segments are sorted on timestamp field if @timestamp field is defined in mapping": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "sorting segments was added in 7.16" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: @@ -49,10 +49,10 @@ --- "Test that index segments are NOT sorted on timestamp field when @timestamp field is dynamically added": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "sorting segments was added in 7.16" - features: allowed_warnings + test_runner_features: allowed_warnings - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml index cef4bbc187c8..aa8323edaa6e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_doc_values_search.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: @@ -243,8 +243,8 @@ setup: --- "Test distance_feature query on date field where only doc values are enabled": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: @@ -399,8 +399,8 @@ setup: --- "Test geo shape query on geo_point field where only doc values are enabled": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: @@ -417,8 +417,8 @@ setup: --- "Test distance_feature query on geo_point field where only doc values are enabled": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "doc values search was added in 8.1.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml index abe4146e66a8..8b92ec9e70f7 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/390_lookup_fields.yml @@ -26,8 +26,8 @@ setup: --- "Retrieve lookup fields": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Lookup fields are introduced in 8.2" - do: search: @@ -52,8 +52,8 @@ setup: --- "Fails to query or aggregate on lookup fields": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "Lookup fields are introduced in 8.2" - do: catch: /Field \[location\] of type \[lookup\] does not support match queries/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml index e013992e06c9..75d488427a90 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -36,8 +36,8 @@ keyword: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -74,8 +74,8 @@ stored text: --- stored keyword: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -112,8 +112,8 @@ stored keyword: --- stored keyword without sibling fields: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -157,8 +157,8 @@ stored keyword without sibling fields: --- force_synthetic_source_ok: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -210,8 +210,8 @@ force_synthetic_source_ok: --- force_synthetic_source_bad_mapping: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -260,8 +260,8 @@ force_synthetic_source_bad_mapping: --- doc values keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -328,8 +328,8 @@ doc values keyword with ignore_above: --- stored keyword with ignore_above: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -398,8 +398,8 @@ stored keyword with ignore_above: --- _source filtering: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -439,8 +439,8 @@ _source filtering: --- _doc_count: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: bug caused by many not having _doc_count fixed in 8.7.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml index e1384a0b8d19..e31628c8dafd 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/410_named_queries.yml @@ -1,6 +1,6 @@ named_queries: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: introduced in 8.8.0 - do: @@ -47,8 +47,8 @@ named_queries: --- named_queries_with_score: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: introduced in 8.8.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml index 2f1b42b94afb..76057b5a364f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/500_date_range.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.0" + - requires: + cluster_features: ["gte_v8.5.1"] reason: fixed in 8.5.1 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml index b2f35fe72441..54b284cd4853 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/510_range_query_out_of_bounds.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: fixed in 8.14.0 - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml index e1f367e8c217..1fefc8bffffa 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/90_search_after.yml @@ -155,8 +155,8 @@ --- "date_nanos": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: fixed in 7.10.0 - do: @@ -221,9 +221,9 @@ --- "_shard_doc sort": - - skip: - version: " - 7.11.99" - reason: _shard_doc sort was added in 7.12 + - requires: + cluster_features: ["gte_v7.12.0"] + reason: _shard_doc sort was added in 7.12 - do: indices.create: @@ -245,8 +245,8 @@ --- "Format sort values": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: Format sort output is introduced in 7.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml index fb289355e08f..65e1ac796b0a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.clone/10_basic.yml @@ -33,8 +33,8 @@ setup: --- "Clone a snapshot": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "Clone snapshot functionality was introduced in 7.10" - do: snapshot.clone: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml index f7c522b71224..d17d88c2728a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.create/10_basic.yml @@ -40,8 +40,8 @@ setup: --- "Create a snapshot and clean up repository": - - skip: - version: " - 7.3.99" + - requires: + cluster_features: ["gte_v7.4.0"] reason: cleanup introduced in 7.4 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml index bec14f062850..ca79a4419b81 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get/10_basic.yml @@ -96,8 +96,8 @@ setup: --- "Get snapshot info contains include_global_state": - - skip: - version: " - 6.1.99" + - requires: + cluster_features: ["gte_v6.2.0"] reason: "include_global_state field has been added in the response in 6.2.0" - do: @@ -156,8 +156,8 @@ setup: --- "Get snapshot info with metadata": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "Introduced with 7.3" - do: @@ -195,8 +195,8 @@ setup: --- "Get snapshot info with index details": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "Introduced in 7.13.0" - do: @@ -235,8 +235,8 @@ setup: --- "Get snapshot info without index names": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "Introduced in 8.3.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml index 0532d208d0cb..f151fef556a6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/snapshot.get_repository/20_repository_uuid.yml @@ -1,7 +1,7 @@ --- "Get repository returns UUID": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: repository UUIDs introduced in 7.12.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml index f32d31c6b524..3a7cf91a780b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/100_synonyms_no_system_index.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 --- "Get synonyms sets returns not found when no index exists": diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml index e85769a359da..bcd58f3f7bd6 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 --- diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml index 5fbc48bd5a08..0ed97d1b0f30 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml index 1ee71e58d4ea..351ff4e186d8 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml index f2d29bf863a8..723c41e163eb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml index 73b07852ad6c..f3711bb0774c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml index 4a00cf3aca0b..79c666e44661 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml index 10eef66d4dda..a4853b0b6d41 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: synonyms.put_synonym: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml index 6b7766bb8515..f6d09a4540eb 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Loading synonyms from index is introduced in 8.10.0 # Create a new synonyms set diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml index c965da31e0d2..dc94b3622240 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml @@ -1,7 +1,7 @@ --- "Reload analyzers for specific synonym set": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Reloading analyzers for specific synonym set is introduced in 8.10.0 # Create synonyms_set1 diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml index 598919d75047..3af4c1ff9039 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/05_dimension_and_metric_in_non_tsdb_index.yml @@ -6,8 +6,8 @@ setup: --- add time series mappings: - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: introduced in 7.16.0 - do: @@ -56,8 +56,8 @@ add time series mappings: --- can't shadow dimensions: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -121,8 +121,8 @@ can't shadow dimensions: --- can't shadow metrics: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -186,8 +186,8 @@ can't shadow metrics: --- # Test that _tsid field is not added if an index is not a time-series index no _tsid in standard indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: time series params only on time series indices introduced in 8.5.0 - do: @@ -217,8 +217,8 @@ no _tsid in standard indices: --- no nested dimensions: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: introduced in 8.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml index e546c60c5916..920111fafb07 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/100_composite.yml @@ -63,8 +63,8 @@ setup: --- composite aggregation on tsid: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -113,8 +113,8 @@ composite aggregation on tsid: --- composite aggregation on tsid with after: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml index 4a6626577d5e..7efb5f5e5692 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml @@ -6,8 +6,8 @@ setup: --- enable: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -50,8 +50,8 @@ enable: --- no sort field: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -70,8 +70,8 @@ no sort field: --- no sort order: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -90,8 +90,8 @@ no sort order: --- no sort mode: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -110,8 +110,8 @@ no sort mode: --- no sort missing: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -130,8 +130,8 @@ no sort missing: --- no partitioning: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -151,8 +151,8 @@ no partitioning: --- routing_path required: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: the message was changed in 8.2.0 - do: @@ -170,8 +170,8 @@ routing_path required: --- routing_path is not allowed in standard mode: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -185,8 +185,8 @@ routing_path is not allowed in standard mode: --- routing required: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -207,8 +207,8 @@ routing required: --- empty routing_path: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: the message was changed in 8.2.0 - do: @@ -227,8 +227,8 @@ empty routing_path: --- empty start end times: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -247,8 +247,8 @@ empty start end times: --- set start_time and end_time: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -310,8 +310,8 @@ set start_time and end_time: --- set start_time and end_time without timeseries mode: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -336,8 +336,8 @@ set start_time and end_time without timeseries mode: --- set bad start_time and end_time: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -377,8 +377,8 @@ set bad start_time and end_time: --- check start_time and end_time with data_nano: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -437,8 +437,8 @@ check start_time and end_time with data_nano: --- check start_time boundary with data_nano: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -488,8 +488,8 @@ check start_time boundary with data_nano: --- check end_time boundary with data_nano: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -540,8 +540,8 @@ check end_time boundary with data_nano: --- check time_series default time bound value: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -573,8 +573,8 @@ check time_series default time bound value: --- check time_series empty time bound value: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml index 03d8d952136e..4192bdf0cf2f 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/110_field_caps.yml @@ -83,8 +83,8 @@ setup: --- field caps on time_series indices: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: metric params only on time series indexes introduced in 8.4.0 - do: @@ -145,8 +145,8 @@ field caps on time_series indices: --- field caps on standard indices: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: metric params only on time series indexes introduced in 8.4.0 - do: @@ -188,8 +188,8 @@ field caps on standard indices: --- field caps on mixed indices: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: metric params only on time series indexes introduced in 8.4.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml index 5767252060bd..f507857d5927 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/120_counter_fields.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "counter field support added in 8.10" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml index cb897c918305..3783e58e4256 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/130_position_fields.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "position metric introduced in 8.8.0, synthetic source shows up in the mapping in 8.10 and on, may trigger assert failures in mixed cluster tests" - do: @@ -51,9 +51,9 @@ setup: --- multi-valued fields unsupported: - - skip: - features: contains - version: " - 8.7.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: bulk: @@ -73,8 +73,8 @@ multi-valued fields unsupported: --- "avg aggregation on position field unsupported": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: position metric introduced in 8.8.0, but exception message changed in 8.10.0 - do: catch: /Field \[location\] of type \[geo_point\]\[position\] is not supported for aggregation \[avg\]/ @@ -88,10 +88,10 @@ multi-valued fields unsupported: --- "geo_bounds on position field": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: @@ -111,10 +111,10 @@ multi-valued fields unsupported: --- "geo_centroid on position field": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: @@ -131,8 +131,8 @@ multi-valued fields unsupported: --- "geo bounding box query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -151,8 +151,8 @@ multi-valued fields unsupported: --- "geo shape intersects query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -168,8 +168,8 @@ multi-valued fields unsupported: --- "geo shape within query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -186,8 +186,8 @@ multi-valued fields unsupported: --- "geo shape disjoint query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -204,8 +204,8 @@ multi-valued fields unsupported: --- "geo shape contains query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -222,8 +222,8 @@ multi-valued fields unsupported: --- "geo distance query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: search: @@ -239,10 +239,10 @@ multi-valued fields unsupported: --- "geo_distance sort": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: @@ -269,10 +269,10 @@ multi-valued fields unsupported: --- "distance_feature query": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - features: close_to + test_runner_features: close_to - do: search: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml index 2ee2391458b0..6eb7a8dcad7a 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/140_routing_path.yml @@ -1,8 +1,8 @@ --- missing routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -89,8 +89,8 @@ missing routing path field: --- missing dimension on routing path field: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: error message changed in 8.14.0 - do: @@ -120,9 +120,9 @@ missing dimension on routing path field: --- multi-value routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml index 8cb2802c2ef9..005cf38cd5ca 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/150_runtime_fields.yml @@ -1,7 +1,7 @@ --- tsdb_execute_painless_api: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: fixed in 8.12.0 and later - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml index 1b61785ba313..9f9d59317454 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/15_timestamp_mapping.yml @@ -6,8 +6,8 @@ setup: --- date: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -54,8 +54,8 @@ date: --- date_nanos: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -102,8 +102,8 @@ date_nanos: --- automatically add with date: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -148,8 +148,8 @@ automatically add with date: --- reject @timestamp with wrong type: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -172,8 +172,8 @@ reject @timestamp with wrong type: --- reject timestamp meta field with wrong type: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -195,8 +195,8 @@ reject timestamp meta field with wrong type: --- enable timestamp meta field: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -223,8 +223,8 @@ enable timestamp meta field: --- reject bad timestamp meta field: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -245,8 +245,8 @@ reject bad timestamp meta field: --- write without timestamp: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -284,8 +284,8 @@ write without timestamp: --- explicitly enable timestamp meta field: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -338,8 +338,8 @@ explicitly enable timestamp meta field: --- unable to create a time series index with @timestamp runtime field: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml index 807f60a0faf3..b710f6b313da 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml @@ -6,8 +6,8 @@ setup: --- ecs style: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: index.mode and routing_path introduced in 8.1.0 - do: @@ -62,8 +62,8 @@ ecs style: --- top level wildcard dim object: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: routing_path object type check improve in 8.2.0 - do: @@ -120,8 +120,8 @@ top level wildcard dim object: --- exact match object type: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: routing_path error message updated in 8.14.0 - do: @@ -153,8 +153,8 @@ exact match object type: --- non keyword matches routing_path: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: routing_path error message updated in 8.14.0 - do: @@ -198,8 +198,8 @@ non keyword matches routing_path: --- runtime field matching routing path: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -240,8 +240,8 @@ runtime field matching routing path: --- "dynamic: runtime matches routing_path": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: routing_path error message updated in 8.8.0 and has_dynamic_mapping condition fixed in 8.14.0 - do: @@ -277,9 +277,9 @@ runtime field matching routing path: --- "dynamic: false matches routing_path": - - skip: - features: contains - version: " - 8.1.99" + - requires: + test_runner_features: contains + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -315,8 +315,8 @@ runtime field matching routing path: --- nested dimensions: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: message changed in 8.2.0 - do: @@ -344,8 +344,8 @@ nested dimensions: --- nested fields: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: message changed in 8.2.0 - do: @@ -375,8 +375,8 @@ nested fields: --- "Unable to define a metric type for a runtime field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - do: @@ -424,8 +424,8 @@ nested fields: --- "Synthetic source": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Synthetic source shows up in the mapping in 8.10 - do: @@ -455,8 +455,8 @@ nested fields: --- regular source: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source - do: @@ -486,8 +486,8 @@ regular source: time_series_dimension: true --- disabled source: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source - do: @@ -518,8 +518,8 @@ disabled source: --- source include/exclude: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source - do: @@ -576,8 +576,8 @@ source include/exclude: --- Supported metric type position: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "position introduced in 8.8.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml index 9d27507d0e32..b0e1595f3d0e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/30_snapshot.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -20,10 +20,10 @@ teardown: --- "Create a snapshot and then restore it": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - features: ["allowed_warnings"] + test_runner_features: ["allowed_warnings"] # Create index - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml index 5b779894a2cb..962926ca81fa 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/40_search.yml @@ -63,8 +63,8 @@ setup: --- query a dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -79,8 +79,8 @@ query a dimension: --- query a metric: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -96,8 +96,8 @@ query a metric: --- "query tsid fails": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -111,8 +111,8 @@ query a metric: --- fetch a dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -130,8 +130,8 @@ fetch a dimension: --- fetch a metric: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -150,8 +150,8 @@ fetch a metric: --- fetch a tag: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -170,8 +170,8 @@ fetch a tag: --- "fetch the tsid": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -189,8 +189,8 @@ fetch a tag: --- aggregate a dimension: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -211,8 +211,8 @@ aggregate a dimension: --- aggregate a metric: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -239,8 +239,8 @@ aggregate a metric: --- aggregate a tag: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -265,8 +265,8 @@ aggregate a tag: --- "aggregate the tsid": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -289,8 +289,8 @@ aggregate a tag: --- "aggregate filter the tsid fails": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -308,8 +308,8 @@ aggregate a tag: --- sort by tsid: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml index 829e26a90805..5c5dc02ad4d0 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/50_alias.yml @@ -63,8 +63,8 @@ setup: --- search an alias: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -92,8 +92,8 @@ search an alias: --- index into alias: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml index b30c03c4797d..6c2d54d7365b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/60_add_dimensions.yml @@ -1,7 +1,7 @@ --- add dimensions with put_mapping: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -53,8 +53,8 @@ add dimensions with put_mapping: --- add dimensions to no dims with dynamic_template over index: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -101,8 +101,8 @@ add dimensions to no dims with dynamic_template over index: --- add dimensions to no dims with dynamic_template over bulk: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -149,8 +149,8 @@ add dimensions to no dims with dynamic_template over bulk: --- add dimensions to some dims with dynamic_template over index: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -201,8 +201,8 @@ add dimensions to some dims with dynamic_template over index: --- add dimensions to some dims with dynamic_template over bulk: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml index 6398fee265fe..80cfa09105ae 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/70_dimension_types.yml @@ -1,8 +1,8 @@ --- keyword dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 @@ -74,9 +74,9 @@ keyword dimension: --- flattened dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 @@ -162,9 +162,9 @@ flattened dimension: --- flattened empty dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 @@ -243,9 +243,9 @@ flattened empty dimension: --- flattened field missing routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -338,9 +338,9 @@ flattened field missing routing path field: --- flattened field misspelled routing path field: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -430,9 +430,9 @@ flattened field misspelled routing path field: --- long dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -505,9 +505,9 @@ long dimension: --- ip dimension: - - skip: - features: close_to - version: " - 8.12.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -580,8 +580,8 @@ ip dimension: --- runtime time series dimension: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml index 486e5bf8dc60..12b29f68050b 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/80_index_resize.yml @@ -85,8 +85,8 @@ setup: --- split: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -101,8 +101,8 @@ split: --- shrink: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -128,8 +128,8 @@ shrink: --- clone: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml index 57ad446eaf63..5f1368abcf43 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml @@ -65,8 +65,8 @@ setup: --- index with routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -88,8 +88,8 @@ index with routing: --- index with routing over _bulk: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -103,8 +103,8 @@ index with routing over _bulk: --- noop update: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -125,8 +125,8 @@ noop update: --- update: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 # We fail even though the document isn't found. @@ -150,8 +150,8 @@ update: --- update over _bulk: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -164,8 +164,8 @@ update over _bulk: --- search with routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 # We fail even though the document isn't found. @@ -177,8 +177,8 @@ search with routing: --- alias with routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -191,8 +191,8 @@ alias with routing: --- alias with search_routing: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -205,8 +205,8 @@ alias with search_routing: --- sort by _id: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -219,8 +219,8 @@ sort by _id: --- aggregate on _id: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: tsdb indexing changed in 8.2.0 - do: @@ -236,8 +236,8 @@ aggregate on _id: --- synthetic source text field: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "synthetic source introduced in 8.7.0" - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml index 2ad71d3b6ed5..f74fde7eb2a2 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml @@ -1,6 +1,6 @@ keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: @@ -57,8 +57,8 @@ keyword: --- stored text: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml index 4dd48f3462a4..33e3500e0c69 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/90_error.yml @@ -1,7 +1,7 @@ --- 'Misspelled fields get "did you mean"': - - skip: - version: " - 7.5.99" + - requires: + cluster_features: ["gte_v7.6.0"] reason: Implemented in 7.6 - do: catch: /\[UpdateRequest\] unknown field \[dac\] did you mean \[doc\]\?/ diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml index b8cd9c6eb0a3..65fe4927513e 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/95_require_alias.yml @@ -1,7 +1,7 @@ --- "Set require_alias flag": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "require_alias flag added in 7.10" - do: catch: missing diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml index 3019a77957fe..8806918703ab 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings_regex" diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml index f68372b4474e..b368975fa5e5 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml @@ -1,18 +1,16 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "allowed_warnings_regex" --- Basic test for upgrade indices: - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "_upgrade api is deprecated since 7.11.0" - features: + test_runner_features: - "warnings" - do: indices.create: diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml index 19c6a2e2bbad..043e525a8e9b 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings" diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml index a78130342519..c64e80d0f6a0 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "allowed_warnings_regex" diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml index 98ff9065dd47..c3b3c4320be9 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" --- diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml index 591f60578b81..b7df872ff0a8 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "allowed_warnings_regex" - do: diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml index 964cd2d6c874..3f3eac1e59e1 100644 --- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml +++ b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings" - do: diff --git a/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml b/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml index a2ff4da6cfbd..8956f4474981 100644 --- a/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml +++ b/test/external-modules/error-query/src/yamlRestTest/resources/rest-api-spec/test/error_query/20_stall_time.yml @@ -3,8 +3,8 @@ --- "Error query with stall time": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: stall_time_seconds error_query field added in 8.10 - do: diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 4c1980fb1f67..1afedeb37114 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -129,6 +129,7 @@ import static java.util.Collections.unmodifiableList; import static org.elasticsearch.client.RestClient.IGNORE_RESPONSE_CODES_PARAM; import static org.elasticsearch.cluster.ClusterState.VERSION_INTRODUCING_TRANSPORT_VERSIONS; import static org.elasticsearch.core.Strings.format; +import static org.elasticsearch.test.rest.TestFeatureService.ALL_FEATURES; import static org.elasticsearch.xcontent.ToXContent.EMPTY_PARAMS; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsString; @@ -240,20 +241,6 @@ public abstract class ESRestTestCase extends ESTestCase { private static EnumSet availableFeatures; private static Set nodesVersions; - private static final TestFeatureService ALL_FEATURES = new TestFeatureService() { - @Override - public boolean clusterHasFeature(String featureId) { - return true; - } - - @Override - public Set getAllSupportedFeatures() { - throw new UnsupportedOperationException( - "Only available to properly initialized TestFeatureService. See ESRestTestCase#createTestFeatureService" - ); - } - }; - protected static TestFeatureService testFeatureService = ALL_FEATURES; protected static Set getCachedNodesVersions() { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java index dde6784f47b0..c9c39b206ada 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java @@ -35,12 +35,22 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.BiConsumer; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static java.util.Collections.emptySet; class ESRestTestFeatureService implements TestFeatureService { + + /** + * In order to migrate from version checks to cluster feature checks, + * we provide synthetic features derived from versions, e.g. "gte_v8.0.0". + */ + private static final Pattern VERSION_FEATURE_PATTERN = Pattern.compile("gte_v(\\d+\\.\\d+\\.\\d+)"); + private final Set allSupportedFeatures; private final Set knownHistoricalFeatureNames; + private final Version version; ESRestTestFeatureService(List featureSpecs, Collection nodeVersions, Set clusterStateFeatures) { List specs = new ArrayList<>(featureSpecs); @@ -50,10 +60,8 @@ class ESRestTestFeatureService implements TestFeatureService { } var historicalFeatures = FeatureData.createFromSpecifications(specs).getHistoricalFeatures(); this.knownHistoricalFeatureNames = historicalFeatures.lastEntry().getValue(); - var minVersion = nodeVersions.stream().min(Comparator.naturalOrder()); - var supportedHistoricalFeatures = minVersion.map(v -> historicalFeatures.floorEntry(v).getValue()) - .orElse(knownHistoricalFeatureNames); - this.allSupportedFeatures = Sets.union(clusterStateFeatures, supportedHistoricalFeatures); + this.version = nodeVersions.stream().min(Comparator.naturalOrder()).orElse(Version.CURRENT); + this.allSupportedFeatures = Sets.union(clusterStateFeatures, historicalFeatures.floorEntry(version).getValue()); } public static boolean hasFeatureMetadata() { @@ -62,9 +70,33 @@ class ESRestTestFeatureService implements TestFeatureService { @Override public boolean clusterHasFeature(String featureId) { - if (hasFeatureMetadata() - && MetadataHolder.FEATURE_NAMES.contains(featureId) == false - && knownHistoricalFeatureNames.contains(featureId) == false) { + if (allSupportedFeatures.contains(featureId)) { + return true; + } + if (MetadataHolder.FEATURE_NAMES.contains(featureId) || knownHistoricalFeatureNames.contains(featureId)) { + return false; // feature known but not present + } + + // check synthetic version features (used to migrate from version checks to feature checks) + Matcher matcher = VERSION_FEATURE_PATTERN.matcher(featureId); + if (matcher.matches()) { + Version extractedVersion = Version.fromString(matcher.group(1)); + if (Version.V_8_14_0.before(extractedVersion)) { + // As of version 8.14.0 REST tests have been migrated to use features only. + // For migration purposes we provide a synthetic version feature gte_vX.Y.Z for any version at or before 8.14.0. + throw new IllegalArgumentException( + Strings.format( + "Synthetic version features are only available before [%s] for migration purposes! " + + "Please add a cluster feature to an appropriate FeatureSpecification; features only necessary for " + + "testing can be supplied via ESRestTestCase#createAdditionalFeatureSpecifications()", + Version.V_8_14_0 + ) + ); + } + return version.onOrAfter(extractedVersion); + } + + if (hasFeatureMetadata()) { throw new IllegalArgumentException( Strings.format( "Unknown feature %s: check the feature has been added to the correct FeatureSpecification in the relevant module or, " @@ -74,12 +106,7 @@ class ESRestTestFeatureService implements TestFeatureService { ) ); } - return allSupportedFeatures.contains(featureId); - } - - @Override - public Set getAllSupportedFeatures() { - return allSupportedFeatures; + return false; } private static class MetadataHolder { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java b/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java index 332a00ce895a..8b3ba874e167 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/TestFeatureService.java @@ -8,10 +8,8 @@ package org.elasticsearch.test.rest; -import java.util.Set; - public interface TestFeatureService { - boolean clusterHasFeature(String featureId); + TestFeatureService ALL_FEATURES = feature -> true; - Set getAllSupportedFeatures(); + boolean clusterHasFeature(String featureId); } diff --git a/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java b/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java index 94b80fcc3fab..7e547e3ec02d 100644 --- a/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java +++ b/test/yaml-rest-runner/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java @@ -24,18 +24,6 @@ import static org.hamcrest.Matchers.is; public class ClientYamlTestExecutionContextTests extends ESTestCase { - private static class MockTestFeatureService implements TestFeatureService { - @Override - public boolean clusterHasFeature(String featureId) { - return true; - } - - @Override - public Set getAllSupportedFeatures() { - return Set.of(); - } - } - public void testHeadersSupportStashedValueReplacement() throws IOException { final AtomicReference> headersRef = new AtomicReference<>(); final String version = randomAlphaOfLength(10); @@ -44,7 +32,7 @@ public class ClientYamlTestExecutionContextTests extends ESTestCase { null, randomBoolean(), Set.of(version), - new MockTestFeatureService(), + TestFeatureService.ALL_FEATURES, Set.of("os") ) { @Override @@ -82,7 +70,7 @@ public class ClientYamlTestExecutionContextTests extends ESTestCase { null, randomBoolean(), Set.of(version), - new MockTestFeatureService(), + TestFeatureService.ALL_FEATURES, Set.of("os") ) { @Override diff --git a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml index 66f9d5df3d9d..780bb7acc7b4 100644 --- a/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml +++ b/x-pack/plugin/ccr/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ccr/auto_follow.yml @@ -54,8 +54,8 @@ name: my_pattern --- "Test put and delete auto follow pattern without specifying exclusion patterns": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "auto-follow exclusion patterns is supported since 7.14.0" - do: @@ -114,8 +114,8 @@ name: my_pattern --- "Test put and delete auto follow pattern with exclusion patterns": - - skip: - version: " - 7.13.99" + - requires: + cluster_features: ["gte_v7.14.0"] reason: "auto-follow exclusion patterns is supported since 7.14.0" - do: @@ -175,8 +175,8 @@ name: my_pattern --- "Test pause and resume auto follow pattern": - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: "pause/resume auto-follow patterns is supported since 7.5.0" - do: diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml index 2362f21d77d8..247611823a76 100644 --- a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml +++ b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Downsampling executed using persistent task framework from version 8.10" - do: @@ -87,8 +87,8 @@ setup: --- "Downsample index": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Downsampling executed using persistent task framework from version 8.10" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml index b8443bb2554a..0bcd35cc6903 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -296,8 +296,8 @@ setup: --- "Downsample index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -394,8 +394,8 @@ setup: --- "Downsample non-existing index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -410,10 +410,10 @@ setup: --- "Downsample failure": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "#103615 merged to 8.13.0 and later" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -442,8 +442,8 @@ setup: --- "Downsample to existing index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -461,8 +461,8 @@ setup: } --- "Downsample using multiple indices": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -531,8 +531,8 @@ setup: --- "Downsample not time_series index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -552,8 +552,8 @@ setup: --- "Downsample no metric index": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Downsample of time series index without metric allowed from version 8.8.0" - do: @@ -645,8 +645,8 @@ setup: --- "Downsample no metric no label index": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Downsample of time series index without metric allowed from version 8.8.0" - do: @@ -730,8 +730,8 @@ setup: --- "Downsample a downsampled index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -823,8 +823,8 @@ setup: --- "Downsample a downsampled index with wrong intervals": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Rollup of rollups introduced in 8.5.0" - do: @@ -869,8 +869,8 @@ setup: --- "Downsample histogram as label": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -971,8 +971,8 @@ setup: --- "Downsample date_nanos timestamp field using custom format": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Bug fixed in 8.8.0" - do: @@ -1073,8 +1073,8 @@ setup: --- "Downsample date timestamp field using strict_date_optional_time_nanos format": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Bug fixed in 8.8.0" - do: @@ -1175,8 +1175,8 @@ setup: --- "Downsample using coarse grained timestamp": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Downsample GA version 8.7.0" - do: @@ -1281,8 +1281,8 @@ setup: --- "Downsample object field": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1349,8 +1349,8 @@ setup: --- "Downsample empty and missing labels": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1410,8 +1410,8 @@ setup: --- "Downsample label with ignore_above": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1537,8 +1537,8 @@ setup: --- "Downsample index with empty dimension": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -1620,8 +1620,8 @@ setup: --- "Downsample index with empty dimension on routing path": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml index bf5f92f62844..13b7ebd1c0f3 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/20_unsupported_aggs.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -42,8 +42,8 @@ setup: --- "Histogram aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -67,8 +67,8 @@ setup: --- "Range aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample: unsupported aggregations errors added in 8.5.0" - do: @@ -99,8 +99,8 @@ setup: --- "Cardinality aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -122,8 +122,8 @@ setup: --- "Percentiles aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: @@ -146,8 +146,8 @@ setup: --- "Top-metrics aggregation on aggregate_metric_double field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsampling: unsupported aggregations errors added in 8.5.0" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml index 4d64127e2fb8..89ec88162ffc 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/30_date_histogram.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup: unsupported aggregations errors added in 8.5.0" - do: @@ -41,10 +41,10 @@ setup: --- "Date histogram aggregation on time series index and rollup indices": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup: unsupported aggregations errors added in 8.5.0" - features: close_to + test_runner_features: close_to - do: indices.put_settings: @@ -232,8 +232,8 @@ setup: --- timezone support - 15m: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "timezone support added in 8.13" - do: @@ -432,8 +432,8 @@ timezone support - 15m: --- timezone support - 1h: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "timezone support added in 8.13" - do: @@ -632,8 +632,8 @@ timezone support - 1h: --- timezone support - 1d: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "timezone support added in 8.13" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml index b9dbf621c60d..1106930c648e 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/40_runtime_fields.yml @@ -1,9 +1,9 @@ --- "Runtime fields accessing metric fields in downsample target index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - features: close_to + test_runner_features: close_to - do: indices.create: @@ -162,8 +162,8 @@ --- "Runtime field accessing dimension fields in downsample target index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -283,8 +283,8 @@ --- "Runtime field accessing label fields in downsample target index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml index 050b16f0674c..b5b08b84ac67 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/50_auto_date_histogram.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "Downsample GA version 8.7.0" - do: diff --git a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml index e533db97b3f7..3cd58e3fd1c1 100644 --- a/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml +++ b/x-pack/plugin/downsample/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/downsample/60_settings.yml @@ -1,7 +1,7 @@ --- "Downsample index with pipeline": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -92,10 +92,10 @@ --- "Downsample datastream with tier preference": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml index a1f7ac650141..c95bb34732da 100644 --- a/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml +++ b/x-pack/plugin/downsample/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "rollup renamed to downsample in 8.5.0" - do: @@ -292,8 +292,8 @@ setup: --- "Downsample index": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml index 0f2a3feea088..cbe4f9837030 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/199_query_rulesets_before_setup.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.9.99" - reason: Introduced in 8.10.0 + - requires: + cluster_features: ["gte_v8.10.0"] + reason: Introduced in 8.10.0 --- "Get query ruleset returns a 404 when no query rulesets exist": diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml index 76676521ae2c..7868919dd6d1 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/200_query_ruleset_put.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml index 4d9022e04206..0183dc8930d7 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/225_query_ruleset_list.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: query_ruleset.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml index 7bd590b2c0ac..cfc847b33f66 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/250_query_ruleset_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: query_ruleset.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml index edd9d7c2e140..688cf57a85b9 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/260_rule_query_search.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: @@ -71,8 +71,8 @@ setup: --- "Perform a rule query specifying a ruleset that does not exist": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Bugfix that was broken in previous versions - do: @@ -91,8 +91,8 @@ setup: --- "Perform a rule query with malformed rule": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Bugfix that was broken in previous versions - do: @@ -276,8 +276,8 @@ setup: --- "Perform a rule query with an organic query that must be rewritten to another query type": - - skip: - version: " - 8.12.1" + - requires: + cluster_features: ["gte_v8.12.2"] reason: Bugfix that was broken in previous versions - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml index e3fad98fd90d..878d81e09596 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/300_connector_put.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml index 8eedc06a025d..b724b50a726a 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/305_connector_post.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml index e7b30aeb281c..10e4620ca560 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/310_connector_list.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml index c0603d0eefd1..03eebb18ceef 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/320_connector_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml index 8d0bfe023293..e552030d3cc0 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/330_connector_update_pipeline.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml index dd74fa7e27c2..ba76d64c2574 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/331_connector_update_scheduling.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml index abb43806ec79..ac102db16376 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/332_connector_update_filtering.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml index 39b7b2d03e68..02f4aa3643c1 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/333_connector_check_in.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - features: is_after + test_runner_features: is_after - do: connector.put: connector_id: test-connector diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml index 08bde123541a..235ac238a856 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/334_connector_update_last_sync_stats.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml index 418a3cf6de94..e0a54962b1d5 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_configuration.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml index 70021e389952..5ca285677a95 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/335_connector_update_error.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml index bf1c7254b9b9..3f7c50a010eb 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/336_connector_update_name.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml index 53cef9f5067b..9723d7628b5c 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/337_connector_update_service_type.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml index 9b2d46bc056d..4ffa5435a3d7 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/338_connector_update_index_name.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml index 2cfed61272e9..77c57532ad47 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/339_connector_update_native.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml index 8463a19919dd..e5a8b17b6dd2 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/340_connector_update_status.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml index 3d82c53acae5..524f474a83aa 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/341_connector_update_api_key_id.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml index 5b5177d83dd1..cb8b8d44b731 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/400_connector_sync_job_post.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml index d75cd65e3e5b..3b5a65ee3aa3 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/410_connector_sync_job_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml index caa6543b6985..3cada2facf68 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/420_connector_sync_job_check_in.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - features: is_after + test_runner_features: is_after - do: connector.put: connector_id: test-connector diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml index eea4ca197614..b7c1560df751 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/430_connector_sync_job_cancel.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml index 58b449a92c30..e42106ee1fa5 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/440_connector_sync_job_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml index 78cfdb845b10..08751573bdd8 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/450_connector_sync_job_error.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml index 94572870f916..3353e7a8dec2 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/460_connector_sync_job_update_stats.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml index 82d9a18bb51e..2d4ec3271413 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/470_connector_sync_job_list.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: Introduced in 8.12.0 - do: connector.put: diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml index 6a4ee3ba7f6c..ed0f7b9309e0 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/500_connector_secret_post.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml index 1762e454b094..54edeb0ab10a 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/505_connector_secret_put.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml index 8fd676bb977b..62b1b4176dc4 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/510_connector_secret_get.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml index ed50fc55a81e..04920673d6ad 100644 --- a/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml +++ b/x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/520_connector_secret_delete.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: Introduced in 8.13.0 --- diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java b/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java index 0446a11240f6..5153d7a2a6d9 100644 --- a/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java +++ b/x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/MixedClusterEsqlSpecIT.java @@ -10,6 +10,7 @@ package org.elasticsearch.xpack.esql.qa.mixed; import org.elasticsearch.Version; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.test.cluster.ElasticsearchCluster; +import org.elasticsearch.test.rest.TestFeatureService; import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase; import org.elasticsearch.xpack.ql.CsvSpecReader.CsvTestCase; import org.junit.AfterClass; @@ -17,8 +18,6 @@ import org.junit.Before; import org.junit.ClassRule; import java.io.IOException; -import java.util.HashSet; -import java.util.Set; import static org.elasticsearch.xpack.esql.CsvTestUtils.isEnabled; import static org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase.Mode.ASYNC; @@ -34,20 +33,18 @@ public class MixedClusterEsqlSpecIT extends EsqlSpecTestCase { static final Version bwcVersion = Version.fromString(System.getProperty("tests.old_cluster_version")); - private static final Set oldClusterFeatures = new HashSet<>(); - private static boolean oldClusterFeaturesInitialized = false; + private static TestFeatureService oldClusterTestFeatureService = null; @Before public void extractOldClusterFeatures() { - if (oldClusterFeaturesInitialized == false) { - oldClusterFeatures.addAll(testFeatureService.getAllSupportedFeatures()); - oldClusterFeaturesInitialized = true; + if (oldClusterTestFeatureService == null) { + oldClusterTestFeatureService = testFeatureService; } } protected static boolean oldClusterHasFeature(String featureId) { - assert oldClusterFeaturesInitialized; - return oldClusterFeatures.contains(featureId); + assert oldClusterTestFeatureService != null; + return oldClusterTestFeatureService.clusterHasFeature(featureId); } protected static boolean oldClusterHasFeature(NodeFeature feature) { @@ -56,8 +53,7 @@ public class MixedClusterEsqlSpecIT extends EsqlSpecTestCase { @AfterClass public static void cleanUp() { - oldClusterFeaturesInitialized = false; - oldClusterFeatures.clear(); + oldClusterTestFeatureService = null; } public MixedClusterEsqlSpecIT(String fileName, String groupName, String testName, Integer lineNumber, CsvTestCase testCase, Mode mode) { diff --git a/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml b/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml index a947c7bfa6e3..8dba8c05e5bb 100644 --- a/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml +++ b/x-pack/plugin/ilm/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/ilm/70_downsampling.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Downsample ILM validations added in 8.5.0" - do: @@ -9,8 +9,8 @@ setup: --- "Test downsample in hot phase without rollover": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "Downsample ILM validations added in 8.5.0" - do: @@ -65,8 +65,8 @@ setup: --- "Test downsample timeout parameter": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "Downsample timeout added in version 8.10.0" - do: diff --git a/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml b/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml index 635e09d82c41..b64fb7b82271 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml +++ b/x-pack/plugin/mapper-constant-keyword/src/yamlRestTest/resources/rest-api-spec/test/20_synthetic_source.yml @@ -1,6 +1,6 @@ constant_keyword: - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: introduced in 8.4.0 - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml index be77cd4ec11c..c2e5de20690d 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: @@ -302,8 +302,8 @@ setup: --- "Composite aggregations": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "unsigned_long support for composite aggs was fixed in 7.11" - do: @@ -379,9 +379,9 @@ setup: --- "Decay": - - skip: - features: close_to - version: " - 8.8.99" + - requires: + test_runner_features: close_to + cluster_features: ["gte_v8.9.0"] reason: "decay functions not supported for unsigned_long" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml index 9b2c4a62474e..6a3fa28b73f6 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/20_null_value.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml index ad8cff79601d..db985b106607 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/30_multi_fields.yml @@ -1,7 +1,7 @@ --- "Multi keyword and unsigned_long fields": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml index 22285a01c372..93ba06ff9f00 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/40_different_numeric.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "unsigned_long was added in 7.10" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml index 8b56e37d13d6..7f82ed3733fd 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "unsigned long script fields api was added in 7.15.0" - do: @@ -293,8 +293,8 @@ setup: --- "Scripted Metric": - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "context for scripted metric was added in 8.1" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml index 8c03684bc470..0c87424a88fe 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/60_collapse.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "collapse on unsigned_long was added in 8.0" - do: diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml index 5d4a971c6fd1..7e47482bf97e 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml +++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/70_time_series.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid introduced in 8.1.0 - do: @@ -49,8 +49,8 @@ setup: --- fetch the _tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -73,8 +73,8 @@ fetch the _tsid: --- fetch the _source: - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: synthetic source support to unsigned long added in 8.7.0 - do: @@ -102,8 +102,8 @@ fetch the _source: # This is caused by the encoding of unsigned_long as a signed long before # being serialized in _tsid aggregate the _tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -134,8 +134,8 @@ aggregate the _tsid: # This is caused by the encoding of unsigned_long as a signed long before # being serialized in _tsid sort by tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -158,8 +158,8 @@ sort by tsid: --- composite aggregation on tsid: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid introduced in 8.1.0 - do: diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml index 90cb04580c2b..4ff2499ad7e7 100644 --- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml +++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "synthetic source support added in 8.5.0" - do: diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml index 806735e8174c..f603e884d8f1 100644 --- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml +++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/50_script_values.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: "version script field support was added in 8.1.0" - do: diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml index a2df0a3c55ee..e822d4016be9 100644 --- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml +++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/60_script_sort_values.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "version script field sorting support was added in 8.3.0" - do: diff --git a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml index 3ac52c2d45d0..e1ec400ce64b 100644 --- a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml +++ b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/multi_cluster/40_text_expansion.yml @@ -145,8 +145,8 @@ teardown: --- "Test text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -166,8 +166,8 @@ teardown: --- "Test named, boosted text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: search: @@ -206,8 +206,8 @@ teardown: --- "Test text expansion search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -225,8 +225,8 @@ teardown: --- "Test text expansion search with weighted tokens rescoring only pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -246,8 +246,8 @@ teardown: --- "Test weighted tokens search": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -267,8 +267,8 @@ teardown: --- "Test weighted tokens search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -285,8 +285,8 @@ teardown: --- "Test weighted tokens search only scoring pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -305,8 +305,8 @@ teardown: --- "Test weighted tokens search that prunes tokens based on frequency": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: diff --git a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml index 3ac52c2d45d0..e1ec400ce64b 100644 --- a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml +++ b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/src/test/resources/rest-api-spec/test/remote_cluster/40_text_expansion.yml @@ -145,8 +145,8 @@ teardown: --- "Test text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -166,8 +166,8 @@ teardown: --- "Test named, boosted text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: search: @@ -206,8 +206,8 @@ teardown: --- "Test text expansion search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -225,8 +225,8 @@ teardown: --- "Test text expansion search with weighted tokens rescoring only pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -246,8 +246,8 @@ teardown: --- "Test weighted tokens search": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -267,8 +267,8 @@ teardown: --- "Test weighted tokens search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -285,8 +285,8 @@ teardown: --- "Test weighted tokens search only scoring pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -305,8 +305,8 @@ teardown: --- "Test weighted tokens search that prunes tokens based on frequency": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml index 907ee4c97587..d81b30b2e6bb 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/clear_cache.yml @@ -53,8 +53,8 @@ setup: --- "Clear searchable snapshots cache": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: searchable snapshots introduced in 7.8.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml index 3ca2f7238bee..f70b9bbe3a86 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/indices_stats.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: segment files stats enhanced in 7.13.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml index 454f6bb19c16..2d9ae59aa908 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/mount.yml @@ -160,8 +160,8 @@ teardown: --- "Test Mount API with unknown request body field": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "unknown request body fields are rejected starting version 8.5.0" - do: catch: bad_request diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml index 8c43c0682c33..a12135d444ec 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/repository.yml @@ -53,8 +53,8 @@ setup: --- "Delete repository when a snapshot is mounted as an index": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "starting 8.0, an error occurs when a repository used by snapshot backed indices is deleted" - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml index 809a45bf938b..5a067b6c7d3c 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/shared_cache_stats.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: node-level cache statistics added in 7.13.0 - do: diff --git a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml index 11e5e052b871..6e38079e1116 100644 --- a/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml +++ b/x-pack/plugin/searchable-snapshots/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/stats.yml @@ -53,8 +53,8 @@ setup: --- "Tests searchable snapshots stats": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: searchable snapshots response format changed in 7.13.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml index 3e6ebdaca9f4..45ec59a419e1 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/100_synthetic_source.yml @@ -1,6 +1,6 @@ constant_keyword: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: synthetic source support added in 8.5.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml index 2aa78a91f4db..44758422ff41 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/10_basic.yml @@ -1,7 +1,7 @@ --- "Test exists query on aggregate metric field": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -57,8 +57,8 @@ --- "Test term query on aggregate metric field": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -133,8 +133,8 @@ --- "Test range query on aggregate metric field": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -210,8 +210,8 @@ --- "Sort": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -352,10 +352,10 @@ - match: { hits.hits.1.fields.metric.0.value_count: 10 } --- "deprecated use of multi-fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "deprecation added in 8.14" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml index 0c765e39656c..98a4d74b8d3e 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/110_field_caps.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: @@ -77,8 +77,8 @@ setup: --- aggregate_metric on standard index: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: aggregate_metric_double field caps changed in 8.5.0 - do: @@ -92,8 +92,8 @@ aggregate_metric on standard index: --- aggregate_metric on standard index conflict with double: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: aggregate_metric_double field caps changed in 8.5.0 - do: @@ -120,8 +120,8 @@ aggregate_metric on standard index conflict with double: --- # Test field_caps on a rollup index field caps on rollup indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: @@ -143,8 +143,8 @@ field caps on rollup indices: --- # Test field_caps on time-series index (mix of raw and rollup indices) field caps on time series indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: @@ -174,8 +174,8 @@ field caps on time series indices: --- # Test field_caps on mixed standard and time-series (mix of raw and rollup) indices field caps on all indices: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: metric params only on time series indices introduced in 8.5.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml index 5872b45cc352..88a0eb017fab 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/20_min_max_agg.yml @@ -31,8 +31,8 @@ setup: - '{"metric": {"min": -100, "max": -40} }' --- "Test min_max aggs": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -55,8 +55,8 @@ setup: --- "Test min_max aggs with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml index 669ba5c15c1f..24323b46c4ed 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/30_sum_agg.yml @@ -27,8 +27,8 @@ setup: - '{"metric": {"sum": -100, "value_count": 40} }' --- "Test sum agg": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -46,8 +46,8 @@ setup: --- "Test sum agg with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml index 4cdf8a1bf6ce..e378dae829bd 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/40_avg_agg.yml @@ -27,8 +27,8 @@ setup: - '{"metric": {"sum": -100, "value_count": 40} }' --- "Test avg agg": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -46,8 +46,8 @@ setup: --- "Test avg agg with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml index f4ed2ea413dc..7c58379d90b7 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/50_value_count_agg.yml @@ -27,8 +27,8 @@ setup: - '{"metric": {"sum": -100, "value_count": 40} }' --- "Test value_count agg": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -46,8 +46,8 @@ setup: --- "Test value_count agg with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml index 9c13c95bc0af..84207778d0ff 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/80_raw_agg_metric_aggs.yml @@ -58,8 +58,8 @@ setup: --- "Test mixed aggregations": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: @@ -93,8 +93,8 @@ setup: --- "Test mixed aggregations with query": - - skip: - version: " - 7.10.99" + - requires: + cluster_features: ["gte_v7.11.0"] reason: "Aggregate metric fields have been added in 7.11" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml index 2325a078764f..f350a5b6163a 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/aggregate-metrics/90_tsdb_mappings.yml @@ -1,6 +1,6 @@ aggregate_double_metric with time series mappings: - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: introduced in 7.16.0 - do: @@ -38,8 +38,8 @@ aggregate_double_metric with time series mappings: --- aggregate_double_metric with wrong time series mappings: - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: introduced in 7.16.0 - do: @@ -78,8 +78,8 @@ aggregate_double_metric with wrong time series mappings: --- "Field caps with tsdb": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "Field caps fix in 8.9" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml index 099d8ad9171e..286df84111cd 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/100_tsdb.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: introduced in 8.1.0 - do: @@ -62,8 +62,8 @@ setup: --- aggregate multi_terms: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: _tsid hashing introduced in 8.13 - do: @@ -88,8 +88,8 @@ aggregate multi_terms: --- "multi_terms aggregation with time_series aggregation": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "multi_terms for time series aggregation fixed in 8.13.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml index b65ab8a771c8..91eae1965fea 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/boxplot.yml @@ -195,10 +195,10 @@ setup: --- "Counter field": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "counter field support added in 8.10" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml index b2f710e5ffed..b719502ae8f2 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml @@ -174,8 +174,8 @@ setup: --- histogram with synthetic source: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -220,8 +220,8 @@ histogram with synthetic source: --- histogram with synthetic source and zero counts: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: introduced in 8.5.0 - do: @@ -255,8 +255,8 @@ histogram with synthetic source and zero counts: --- histogram with large count values: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: Support for `long` values was introduced in 8.11.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml index 4544a9beed30..d440e2292b64 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/matrix_stats.yml @@ -53,10 +53,10 @@ setup: --- "matrix stats all fields available with two fields": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - features: close_to + test_runner_features: close_to - do: search: @@ -95,10 +95,10 @@ setup: --- "matrix stats all fields available with one field": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - features: close_to + test_runner_features: close_to - do: search: @@ -124,10 +124,10 @@ setup: --- "matrix stats field not in all indices bad request": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - features: close_to + test_runner_features: close_to - do: catch: bad_request @@ -147,10 +147,10 @@ setup: --- "matrix stats with bucket_selector": - - skip: - version: " - 8.3.99" + - requires: + cluster_features: ["gte_v8.4.0"] reason: bug fixed in 8.4.0 - features: close_to + test_runner_features: close_to - do: search: @@ -209,10 +209,10 @@ setup: --- "Counter field": - - skip: - version: " - 8.9.99" + - requires: + cluster_features: ["gte_v8.10.0"] reason: "counter field support added in 8.10" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml index 3b2c2a33b97d..fec17af8cdeb 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/nested_top_metrics_sort.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: indices.create: @@ -106,8 +106,8 @@ teardown: --- "sort on top metrics keyword same version": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -158,8 +158,8 @@ teardown: --- "sort on top metrics keyword desc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -209,8 +209,8 @@ teardown: --- "sort on top metrics keyword asc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -260,8 +260,8 @@ teardown: --- "sort on top metrics numeric desc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -311,8 +311,8 @@ teardown: --- "sort on top metrics numeric asc": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -362,8 +362,8 @@ teardown: --- "sort on top metrics non-existing field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: bug fixed in 8.2.0 - do: @@ -395,8 +395,8 @@ teardown: --- "terms order by top metrics null values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -461,8 +461,8 @@ teardown: --- "terms order by top metrics date not null values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -548,8 +548,8 @@ teardown: --- "terms order by top metrics numeric not null integer values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -635,8 +635,8 @@ teardown: --- "terms order by top metrics numeric not null double values": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 @@ -723,8 +723,8 @@ teardown: --- "terms order by top metrics size greater than 1 rewrite_to_filter_by_filter true": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -821,8 +821,8 @@ teardown: --- "terms order by top metrics missing metric rewrite_to_filter_by_filter true": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -867,8 +867,8 @@ teardown: --- "terms order by top metrics equal values sorted on term": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -954,8 +954,8 @@ teardown: --- "terms order by top metrics size greater than 1 rewrite_to_filter_by_filter false": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: @@ -1052,8 +1052,8 @@ teardown: --- "terms order by top metrics missing metric rewrite_to_filter_by_filter false": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Bug fixed in 8.2.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml index ea1dd5bb9961..746919f1e8a5 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/rate.yml @@ -36,8 +36,8 @@ --- "rate with doc_count": - - skip: - version: " - 7.15.99" + - requires: + cluster_features: ["gte_v7.16.0"] reason: bug fixed in 7.16.0 - do: bulk: @@ -208,10 +208,10 @@ --- "rate aggregation on counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - features: close_to + test_runner_features: close_to - do: indices.create: @@ -331,10 +331,10 @@ --- "rate aggregation on counter field with unit": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - features: close_to + test_runner_features: close_to - do: indices.create: @@ -445,10 +445,10 @@ --- "rate aggregation on counter field partial bucket": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - features: close_to + test_runner_features: close_to - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml index 62115b3b8708..45330256322e 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/reset_tracking_rate.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.5.0" + - requires: + cluster_features: ["gte_v8.5.1"] reason: Reset tracking rate agg added in 8.6 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml index 74a741a8a203..3d78fedee424 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/top_metrics.yml @@ -710,8 +710,8 @@ --- "Counter field": - - skip: - version: " - 8.6.99" + - requires: + cluster_features: ["gte_v8.7.0"] reason: "counter field support added in 8.7" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml index 6312281ac50a..5b4f11712089 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/usage.yml @@ -14,8 +14,8 @@ setup: --- "Usage stats on analytics indices": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "stats is not working in earlier versions at the moment" - do: {xpack.usage: {}} diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml index 393ae3fbe24f..925005b98947 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/10_basic.yml @@ -172,8 +172,8 @@ setup: --- "Auto date histogram interval is saved": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "interval is only serialized from 8.3 on" - do: async_search.submit: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml index 348f3bcd5843..5d89a41d8715 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/async_search/20-with-poin-in-time.yml @@ -1,7 +1,7 @@ --- "Async search with point in time": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "point in time is introduced in 7.10" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml index ee08fcc3693d..861247350c9f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/constant_keyword/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "constant_keyword was added in 7.7" - do: @@ -202,8 +202,8 @@ setup: --- "Simple filter": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "constant_keyword was added in 7.7" - do: @@ -283,8 +283,8 @@ setup: --- "Filter with histogram": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "constant_keyword was added in 7.7" - do: @@ -452,10 +452,10 @@ Cardinality agg: - match: { aggregations.card.value: 1 } --- "deprecated use of multi-fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "deprecation added in 8.14" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml index e5ad63fa3115..a547571cf776 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/10_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "counted_keyword was added in 8.12" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml index 1fe48207b558..2925a0023ca3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/counted_keyword/20_no_index.yml @@ -1,7 +1,7 @@ setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "index option on counted_keyword was added in 8.13" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml index 4d464cfcb454..f8c3a4d660fe 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_streams/10_data_stream_resolvability.yml @@ -1,9 +1,9 @@ --- "Verify data stream resolvability for xpack apis": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -52,10 +52,10 @@ --- "Verify data stream resolvability in ilm explain api": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: ilm.put_lifecycle: @@ -122,10 +122,10 @@ - is_true: acknowledged --- "Verify data stream resolvability rollup": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -157,10 +157,10 @@ --- "Verify data stream resolvability in ILM remove policy API": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: ilm.put_lifecycle: @@ -253,10 +253,10 @@ --- "Verify data stream resolvability for graph explore API": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -316,10 +316,10 @@ --- "Verify data stream resolvability in migrations API": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -355,10 +355,10 @@ --- "Verify data stream resolvability in async search": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -425,10 +425,10 @@ --- "Verify data stream resolvability in rollup search": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -497,10 +497,10 @@ --- "Verify data stream resolvability in EQL search API with no sequences": - - skip: - version: " - 7.9.1" + - requires: + cluster_features: ["gte_v7.9.2"] reason: "EQL data stream resolution only properly works from 7.9.2" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -561,10 +561,10 @@ --- "Verify data stream resolvability in EQL search API with sequences": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "EQL data stream resolution with queries using sequences only properly works from 7.10.0 (when point-in-time is introduced)" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: @@ -626,10 +626,10 @@ --- "Verify data stream resolvability in PIT searches": - - skip: - version: " - 7.9.99" + - requires: + cluster_features: ["gte_v7.10.0"] reason: "Point-In-Time was introduced in 7.10.0" - features: allowed_warnings + test_runner_features: allowed_warnings - do: allowed_warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml index 99e6cdc72faf..b93241c09302 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/deprecation/10_basic.yml @@ -17,9 +17,10 @@ setup: --- "Test ml": - skip: - version: "7.0.0 - " - features: ["headers", "warnings"] + cluster_features: ["gte_v7.0.0"] reason: this test needs adjusting to contain syntax deprecated in 7.x and removed in 8.0 + - requires: + test_runner_features: ["headers", "warnings"] # Index the config directly to prevent the deprecated # use_dis_max field being rewritten by the parser. This diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml index afe4bcabee3d..c9b05c4e13a8 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/enrich/10_basic.yml @@ -62,10 +62,10 @@ setup: --- "Test using the deprecated elasticsearch_version field results in a warning": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "elasticsearch_version field deprecated in 8.12.0, to be removed in 9.0" - features: warnings + test_runner_features: warnings - do: warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml index c72315312afc..412e23a76853 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/100_bug_fix.yml @@ -1,9 +1,9 @@ --- "Coalesce and to_ip functions": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "fixes in 8.12 or later" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: bulk: index: test @@ -58,8 +58,8 @@ --- "unsupported and invalid mapped fields": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "fixes in 8.13 or later" - do: indices.create: @@ -129,8 +129,8 @@ --- "null MappedFieldType on single value detection #103141": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "fixes in 8.13 or later" - do: indices.create: @@ -198,8 +198,8 @@ --- "text in functions #105379": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "fixes in 8.13 or later" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml index e15372bc3088..52d390e7b288 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml index 0f8dbbb97f57..a18dbba1abfa 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/110_all_null.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "feature added in 8.13" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml index c2e728535a40..17034de677b8 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/120_profile.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "profile option added in 8.12" - features: warnings + test_runner_features: warnings - do: indices.create: index: test @@ -120,8 +120,8 @@ setup: --- avg 8.14 or after: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "avg changed starting 8.14" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml index 8a9004d372d1..053d33ee9bf4 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/130_spatial.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Mixed cluster tests don't work with the changed error message from sort" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml index 820df8a3ff06..672dfa1503c4 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/20_aggs.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml index 9a050db5132b..068493993277 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "fixed in 8.13" - features: warnings + test_runner_features: warnings - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml index 8f1d64e169fd..9dded5d0855c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/30_types.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "more field loading added in 8.12+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex --- constant_keyword: @@ -621,8 +621,8 @@ version: --- id: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: indices.create: @@ -685,8 +685,8 @@ unsigned_long: --- _source: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: @@ -713,8 +713,8 @@ _source: --- _source keep all: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: @@ -748,8 +748,8 @@ _source keep all: --- _source disabled: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: @@ -871,8 +871,8 @@ synthetic _source text with parent keyword: --- geo_point: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "geo_point precision changed in 8.13.0" - do: indices.create: @@ -904,8 +904,8 @@ geo_point: --- cartesian_point: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "cartesian_point precision changed in 8.13.0" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml index 26fc26d5c044..7549d33b4de1 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_tsdb.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test @@ -107,8 +107,8 @@ setup: --- load everything: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: allowed_warnings_regex: @@ -233,8 +233,8 @@ from index pattern explicit counter use: --- _source: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "_source is available in 8.13+" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml index 8b28776e42fc..c34666bb12b0 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/40_unsupported_types.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test @@ -109,8 +109,8 @@ setup: --- unsupported: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Latest types supported in ESQL as of 8.13.0" - do: @@ -289,8 +289,8 @@ unsupported: --- unsupported with sort: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Latest types supported in ESQL as of 8.13.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml index 13a88d0c2f79..05ba568838fe 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/45_non_tsdb_counter.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml index 87af58cf8989..d8aad2753443 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/50_index_patterns.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex --- disjoint_mappings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml index b294629dda07..8a5d3be6758e 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_enrich.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: cities @@ -92,10 +92,10 @@ teardown: --- "Enrich on keyword": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Enriching with text field in the enrich fields list involves reading text from source, not supported before 8.13.0" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: @@ -166,8 +166,8 @@ teardown: --- "Enrich on text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "TEXT field ENRICH support was added in 8.14.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml index 67dc4bbf2a06..74c0e9ef1bb3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "Introduction of META tracking in 8.14+" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml index 77a6811b899f..076bf116292d 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/61_enrich_ip.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: networks @@ -133,8 +133,8 @@ teardown: --- "IP text fields": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "ENRICH support for TEXT fields was added in 8.14.0" - do: @@ -161,8 +161,8 @@ teardown: --- "Invalid IP strings": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IP range ENRICH support was added in 8.14.0" - do: @@ -173,8 +173,8 @@ teardown: --- "IP": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IP range ENRICH support was added in 8.14.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml index ea5ecd051159..19b08007fe18 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/62_extra_enrich.yml @@ -1,7 +1,7 @@ --- "Enrich fields includes match field": - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "enrich match field was mistakenly excluded in 8.11" - do: indices.create: @@ -72,8 +72,8 @@ --- movies: # This is a subset of a demo that we use for ESQL's ENRICH command. - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "there's a bug in sub-fields in 8.12" - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml index bcae5e7cf24a..e181f77f2bce 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/70_locale.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: events diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml index dcc055707b5c..9607b6438572 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/80_text.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "ESQL is available in 8.11+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: @@ -123,10 +123,10 @@ setup: --- "IN on text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IN on text fixed in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" @@ -148,10 +148,10 @@ setup: --- "IN on text and itself": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IN on text fixed in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" @@ -174,10 +174,10 @@ setup: --- "NOT IN on text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "IN on text fixed in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" @@ -368,10 +368,10 @@ setup: --- "split text": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "functions fixed for text in v 8.14" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: allowed_warnings_regex: - "No limit defined, adding default limit of \\[.*\\]" diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml index 3b58ee01edfa..a3be4221712f 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/81_text_exact_subfields.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Exact subfields fixed in v 8.13" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml index c10554cebf30..f69854388baf 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/90_non_indexed.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: "extracting non-indexed fields available in 8.12+" - features: allowed_warnings_regex + test_runner_features: allowed_warnings_regex - do: indices.create: index: test diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml index 8d3bf93962d9..729f284bde95 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/forecast.yml @@ -17,7 +17,7 @@ setup: "Test forecast unknown job": - skip: reason: "https://github.com/elastic/elasticsearch/issues/34747" - version: "6.5.0 - " + cluster_features: ["gte_v6.5.0"] - do: catch: missing diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml index e19a8c48a042..9577f80f4592 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/post_data.yml @@ -206,8 +206,9 @@ setup: "Test POST data with invalid parameters": - skip: reason: "https://github.com/elastic/elasticsearch/issues/34747" - version: "6.5.0 - " - features: + cluster_features: ["gte_v6.5.0"] + - requires: + test_runner_features: - "warnings" - do: @@ -264,7 +265,7 @@ setup: "Test Flush data with invalid parameters": - skip: reason: "https://github.com/elastic/elasticsearch/issues/34747" - version: "6.5.0 - " + cluster_features: ["gte_v6.5.0"] - do: catch: missing diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml index 869bba90345c..56c0a58c666b 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/search_knn_query_vector_builder.yml @@ -105,8 +105,8 @@ setup: --- "Test vector search with query_vector_builder": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "introduced after 8.13" - do: search: @@ -124,8 +124,8 @@ setup: --- "nested kNN search with inner_hits size": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "introduced after 8.13" - do: headers: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml index f92870b61f1b..8dee722bbb18 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/text_expansion_search.yml @@ -110,8 +110,8 @@ setup: --- "Test text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -131,8 +131,8 @@ setup: --- "Test named, boosted text expansion search with pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: search: @@ -171,8 +171,8 @@ setup: --- "Test text expansion search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -190,8 +190,8 @@ setup: --- "Test text expansion search with weighted tokens rescoring only pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "pruning introduced in 8.13.0" - do: @@ -211,8 +211,8 @@ setup: --- "Test weighted tokens search": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -232,8 +232,8 @@ setup: --- "Test weighted tokens search with default pruning config": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -250,8 +250,8 @@ setup: --- "Test weighted tokens search only scoring pruned tokens": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -270,8 +270,8 @@ setup: --- "Test weighted tokens search that prunes tokens based on frequency": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "weighted token search introduced in 8.13.0" - do: @@ -290,8 +290,8 @@ setup: --- "Test text-expansion that displays error for invalid queried field type": - - skip: - version: " - 8.13.99" + - requires: + cluster_features: ["gte_v8.14.0"] reason: "validation for invalid field type introduced in 8.14.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml index f94e2a552675..42935ff09027 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/privileges/10_basic.yml @@ -327,8 +327,8 @@ teardown: --- "Test clear privileges cache": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "application privileges cache is available since 7.9.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml index ffd5358a12d0..9df3731a0994 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/profiling/10_basic.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Universal Profiling test infrastructure is available in 8.12+" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml index c203039d45db..6560c6f47053 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/put_job.yml @@ -357,8 +357,8 @@ setup: --- "Test put_job with comma-delimited index pattern": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: Comma delimited index pattern introduced in 8.2.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml index 8a771a8d1596..c4aabc520ab5 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/rollup/rollup_search.yml @@ -150,8 +150,8 @@ setup: --- "Basic Search with rest_total_hits_as_int": - - skip: - version: " - 6.5.99" + - requires: + cluster_features: ["gte_v6.6.0"] reason: rest_total_hits_as_int was introduced in 6.6.0 - do: rollup.rollup_search: @@ -910,10 +910,10 @@ setup: --- "Obsolete Timezone": - - skip: - version: " - 7.1.99" - reason: "IANA TZ deprecations in 7.2" - features: "warnings" + - requires: + cluster_features: ["gte_v7.2.0"] + reason: "IANA TZ deprecations in 7.2" + test_runner_features: "warnings" - do: indices.create: index: tz @@ -1055,9 +1055,9 @@ setup: --- "Obsolete BWC Timezone": - - skip: - version: " - 7.1.99" - reason: "IANA TZ deprecations in 7.2" + - requires: + cluster_features: ["gte_v7.2.0"] + reason: "IANA TZ deprecations in 7.2" - do: indices.create: index: tz_rollup diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml index ca07b888ab5c..eaa5b8b42a84 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/search-business-rules/10_pinned_query.yml @@ -51,8 +51,8 @@ setup: --- "Test pinned query with ID and index": - - skip: - version: " - 7.14.99" + - requires: + cluster_features: ["gte_v7.15.0"] reason: "the 'docs' option was added in 7.15" - do: search: @@ -80,8 +80,8 @@ setup: --- "Test pinned query with docs": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: "'_index' was made optional in 8.11" - do: search: @@ -108,7 +108,7 @@ setup: --- "Test pinned query with docs and no index fail in previous versions": - skip: - version: "8.10.99 - " + cluster_features: ["gte_v8.10.99"] reason: "'_index' was made optional in 8.11, this test is for explicit failure tests" - do: catch: bad_request diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml index 1f56a8c37396..ceaa767be3d3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/10_usage.yml @@ -53,8 +53,8 @@ setup: --- "Tests searchable snapshots usage stats": - - skip: - version: " - 7.11.99" + - requires: + cluster_features: ["gte_v7.12.0"] reason: storage flag introduced in 7.12.0 - do: @@ -86,8 +86,8 @@ setup: --- "Tests searchable snapshots usage stats with full_copy and shared_cache indices": - - skip: - version: " - 7.12.99" + - requires: + cluster_features: ["gte_v7.13.0"] reason: "extra full_copy and shared_cache fields introduced in 7.13.0" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml index 8d9c138b9c16..b1ab120fff44 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/searchable_snapshots/20_synthetic_source.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: added in 8.5 - do: @@ -56,8 +56,8 @@ setup: --- "Tests searchable snapshots usage stats": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: added in 8.5 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml index 978cf8498319..553201680f8c 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/14_cat_indices.yml @@ -88,8 +88,8 @@ teardown: --- "Test empty request while single authorized index": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: cat indices was changed in 8.11.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml index 4757247a946d..12aa9806301e 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/50_data_streams.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.8.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -105,10 +105,10 @@ teardown: --- "Test backing indices inherit parent data stream privileges": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers"] + test_runner_features: ["headers"] - do: # superuser indices.create_data_stream: @@ -173,10 +173,10 @@ teardown: --- "Test that requests not supporting data streams do not include data streams among authorized indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers"] + test_runner_features: ["headers"] - do: # superuser indices.create_data_stream: @@ -205,8 +205,8 @@ teardown: --- "Test auto mapping updates unauthorized for create_doc privilege": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "change to 7.8.99 after backport" - do: # superuser @@ -305,8 +305,8 @@ teardown: --- "Test that create data stream is limited to authorized namespace": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -328,8 +328,8 @@ teardown: --- "Test that get data stream is limited to authorized namespace": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: # superuser @@ -393,8 +393,8 @@ teardown: --- "Test that delete data stream is limited to authorized namespace": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: # superuser @@ -432,8 +432,8 @@ teardown: --- "Test that data streams stats is limited to authorized namespace": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: "change to 7.8.99 after backport" - do: # superuser @@ -487,10 +487,10 @@ teardown: --- "auto_configure privilege permits auto-create of data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers", "allowed_warnings"] + test_runner_features: ["headers", "allowed_warnings"] - do: allowed_warnings: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml index ac506b19ccdd..34aa4b5c64b1 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/51_data_stream_aliases.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.99.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v8.0.0"] reason: "data stream aliases not yet backported to 7.x branch" - do: @@ -165,9 +165,9 @@ teardown: --- "Basic read authorization test": - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.99.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v8.0.0"] reason: "data stream aliases not yet backported to 7.x branch" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml index 85c455c41277..83899ff9f5a3 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/55_auto_configure.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.8.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v7.9.0"] reason: "auto_configure available in 7.9+" - do: @@ -57,10 +57,10 @@ teardown: --- "auto_configure privilege permits auto-create of indices": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "auto_configure available in 7.9+" - features: ["headers", "allowed_warnings"] + test_runner_features: ["headers", "allowed_warnings"] # should succeed because test_user is authorized for auto_configure on index-auto-configure - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml index 50c04836bd18..6bca2c8b80a5 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/60_resolve_index.yml @@ -1,8 +1,8 @@ --- setup: - - skip: - features: ["headers", "allowed_warnings"] - version: " - 7.8.99" + - requires: + test_runner_features: ["headers", "allowed_warnings"] + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - do: @@ -89,10 +89,10 @@ teardown: --- "resolve index respects view_index_metadata privilege": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams available in 7.9+" - features: ["headers", "allowed_warnings"] + test_runner_features: ["headers", "allowed_warnings"] - do: # superuser indices.create_data_stream: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml index 66ce482f7060..a206ceddb4b9 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/70_tsdb.yml @@ -1,6 +1,6 @@ setup: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - do: @@ -62,10 +62,10 @@ setup: --- document level security on tag: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -109,10 +109,10 @@ document level security on tag: --- document level security on dimension: - - skip: - version: " - 8.11.99" + - requires: + cluster_features: ["gte_v8.12.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -156,10 +156,10 @@ document level security on dimension: --- document level security on tsid is not possible: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers # It'd be better if this failed immediately but security doesn't build the # query until you use it on an index. @@ -201,10 +201,10 @@ document level security on tsid is not possible: --- create_doc permission can create: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -267,10 +267,10 @@ create_doc permission can create: --- create_doc permission can't overwrite: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -334,10 +334,10 @@ create_doc permission can't overwrite: --- index permission can create: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: @@ -400,10 +400,10 @@ index permission can create: --- index permission can overwrite: - - skip: - version: " - 8.0.99" + - requires: + cluster_features: ["gte_v8.1.0"] reason: _tsid support introduced in 8.1.0 - features: headers + test_runner_features: headers - do: security.put_role: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml index 9e59d6a065d3..c2dea99cdc44 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/authz/80_downsample.yml @@ -1,8 +1,8 @@ setup: - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: indices.create: @@ -77,10 +77,10 @@ setup: --- "Downsample user missing admin permissions to run the downsample operation": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: @@ -122,10 +122,10 @@ setup: --- "Downsample admin user with field level security settings defined on the source index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: @@ -166,10 +166,10 @@ setup: --- "Downsample admin user with document level security settings defined on the source index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: @@ -210,10 +210,10 @@ setup: --- "Downsample admin user without document level or field level security settings defined on the source index": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "downsample introduced in 8.5.0" - features: headers + test_runner_features: headers - do: security.put_role: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml index 580505ba89bc..0cd038436214 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/120_position_geo_line.yml @@ -1,7 +1,7 @@ --- setup: - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: position metric introduced in 8.8.0 - do: indices.create: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml index 05a072485fb3..b92fe608b896 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/70_script_doc_values.yml @@ -93,8 +93,8 @@ setup: --- "geoshape value": - - skip: - version: " - 8.8.99" + - requires: + cluster_features: ["gte_v8.9.0"] reason: output changed in 8.9 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml index dc09cf91be72..5320f3c16300 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/sql/sql.yml @@ -39,7 +39,7 @@ setup: --- "Paging through results": - skip: - version: "8.1.99 - " + cluster_features: ["gte_v8.1.99"] reason: PIT cursors introduced in 8.2 no longer return empty last page - do: sql.query: @@ -78,8 +78,8 @@ setup: --- "Paging through results with PIT cursor": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: PIT cursors introduced in 8.2 no longer return empty last page - do: sql.query: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml index 7709df92ad95..d89b57129ff8 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/10_basic.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.15.0" + - requires: + cluster_features: ["gte_v7.15.1"] reason: original indices are propagated correctly in 7.15.1 - features: headers + test_runner_features: headers - do: cluster.health: wait_for_status: yellow @@ -317,8 +317,8 @@ teardown: --- "Test basic term enumeration on doc value only field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "terms enum support for doc value only keyword fields was added in 8.2.0" - do: @@ -329,8 +329,8 @@ teardown: --- "Test basic term enumeration on version field": - - skip: - version: " - 8.7.99" + - requires: + cluster_features: ["gte_v8.8.0"] reason: "terms enum support for version fields was added in 8.8.0" - do: @@ -393,8 +393,8 @@ teardown: --- "Test case insensitivity on doc value only field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "terms enum support for doc value only keyword fields was added in 8.2.0" - do: @@ -411,8 +411,8 @@ teardown: --- "Test null search string allowed": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: TODO remove this skip after PR 73144 is backported to 7.x - do: @@ -449,8 +449,8 @@ teardown: --- "Test search after on doc value only keyword field": - - skip: - version: " - 8.1.99" + - requires: + cluster_features: ["gte_v8.2.0"] reason: "terms enum support for doc value only keyword fields was added in 8.2.0" - do: @@ -531,8 +531,8 @@ teardown: --- "Test search after on unconfigured constant keyword field": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: bug fixed in 8.3.0 - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml index 751c9d3880d2..875ba3609915 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/terms_enum/20_fieldtypes.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.15.0" + - requires: + cluster_features: ["gte_v7.15.1"] reason: original indices are propagated correctly in 7.15.1 - features: headers + test_runner_features: headers - do: cluster.health: wait_for_status: yellow diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml index 78f627b80128..a49d825bcc08 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/10_basic.yml @@ -3,9 +3,9 @@ --- setup: - - skip: - features: headers - version: " - 7.10.0" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.10.1"] reason: "version field is added to 7.10" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml index 0bfde800d8bd..61b7b6972287 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/versionfield/20_scripts.yml @@ -3,9 +3,9 @@ --- setup: - - skip: - features: headers - version: " - 7.10.0" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.10.1"] reason: "version field is added to 7.10" - do: @@ -58,8 +58,8 @@ setup: --- "Sort script returning version value": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "order by script returning version supported in v 8.3" - do: search: @@ -74,8 +74,8 @@ setup: --- "Sort script with field() returning version value": - - skip: - version: " - 8.2.99" + - requires: + cluster_features: ["gte_v8.3.0"] reason: "order by script returning version supported in v 8.3" - do: search: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml index f7c4e97c0365..efd6c11ac546 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/voting_only_node/10_basic.yml @@ -1,8 +1,8 @@ --- "cluster stats with voting only node stats": - - skip: - version: " - 7.2.99" + - requires: + cluster_features: ["gte_v7.3.0"] reason: "voting only nodes are added in v7.3" - do: diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml index 05b6847dc84e..321e3b703b37 100644 --- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml +++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/wildcard/10_wildcard_basic.yml @@ -1,7 +1,7 @@ setup: - - skip: - features: headers - version: " - 7.8.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.9.0"] reason: "wildcard fields were added from 7.9" - do: @@ -106,9 +106,9 @@ setup: --- "Case insensitive query": - - skip: - features: headers - version: " - 7.9.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.10.0"] reason: "Case insensitive flag added in 7.10" - do: search: diff --git a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml index de954080253b..2cf26f336ba4 100644 --- a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml +++ b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings" - "allowed_warnings_regex" diff --git a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml index 26cf471ea9db..a2d05446bbe1 100644 --- a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml +++ b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings_regex" - do: diff --git a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml index c2c5065ed485..55392de5defa 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml +++ b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/10_synonyms_with_privileges.yml @@ -1,7 +1,7 @@ setup: - - skip: - features: headers - version: " - 8.9.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: diff --git a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml index b1976bc6229e..e9188e90dd44 100644 --- a/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml +++ b/x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/resources/rest-api-spec/test/synonyms_privileges/20_synonyms_no_privileges.yml @@ -1,7 +1,7 @@ setup: - - skip: - features: headers - version: " - 8.9.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v8.10.0"] reason: Introduced in 8.10.0 - do: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml index 883244624881..30cad5ce68c6 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/100_resolve_index.yml @@ -1,7 +1,7 @@ --- "Resolve index with indices, aliases, and data streams": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "data streams only supported in 7.9+" - do: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml index 58658114e6f9..6b1576f0bd6d 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/110_resolve_cluster.yml @@ -1,7 +1,7 @@ --- "Resolve cluster with indices, aliases, and data streams": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "resolve cluster added in 8.13" - do: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml index aef1375be01d..4c0bbfd7ec13 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-basic-license/src/test/resources/rest-api-spec/test/querying_cluster/80_esql.yml @@ -150,8 +150,8 @@ teardown: --- "Enrich across clusters": - - skip: - version: " - 8.12.99" + - requires: + cluster_features: ["gte_v8.13.0"] reason: "Enrich across clusters available in 8.13 or later" - do: indices.create: diff --git a/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml b/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml index ffdce6e33646..338d0d925da5 100644 --- a/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml +++ b/x-pack/qa/multi-cluster-search-security/legacy-with-full-license/src/test/resources/rest-api-spec/test/querying_cluster/10_dls_fls.yml @@ -50,8 +50,8 @@ teardown: --- "Async search with document and field level security": - - skip: - version: " - 7.6.99" + - requires: + cluster_features: ["gte_v7.7.0"] reason: "async search available since 7.7" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml index f0aafeccf5ca..c8418197d044 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/100_analytics_usage.yml @@ -1,9 +1,9 @@ --- setup: - - skip: - version: " - 7.4.99" + - requires: + cluster_features: ["gte_v7.5.0"] reason: "analytics wasn't available before 7.5" - features: allowed_warnings + test_runner_features: allowed_warnings - do: bulk: index: analytics_usage @@ -18,8 +18,8 @@ setup: --- "Basic test for usage stats on analytics indices": - - skip: - version: " - 7.7.99" + - requires: + cluster_features: ["gte_v7.8.0"] reason: "stats are not working in earlier versions" - do: xpack.info: {} diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml index 2bafa1142683..3b2648fe3177 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/110_enrich.yml @@ -1,7 +1,7 @@ --- "Enrich stats query smoke test for mixed cluster": - - skip: - version: " - 7.8.99" + - requires: + cluster_features: ["gte_v7.9.0"] reason: "Privilege change of enrich stats is backported to 7.9.0" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml index 8cb9b33a1d0f..8b14a4e1b668 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/120_api_key.yml @@ -25,9 +25,10 @@ --- "Create API key with metadata in a mixed cluster (pre 7.13.0)": + - requires: + test_runner_features: [headers, node_selector] - skip: - features: [headers, node_selector] - version: "7.13.0 - " + cluster_features: ["gte_v7.13.0"] reason: "Support metadata on API keys introduced in 7.13.0" - do: @@ -46,9 +47,9 @@ --- "Create API key with metadata in a mixed cluster": - - skip: - features: [headers] - version: " - 7.12.99" + - requires: + test_runner_features: [headers] + cluster_features: ["gte_v7.13.0"] reason: "Support metadata on API keys introduced in 7.13.0" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml index eafaecaa67ee..2b5c3b418eb8 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/130_operator_privileges.yml @@ -1,9 +1,9 @@ --- "Test operator privileges will work in the mixed cluster": - - skip: - features: headers - version: " - 7.10.99" + - requires: + test_runner_features: headers + cluster_features: ["gte_v7.11.0"] reason: "operator privileges are available since 7.11" # The default user ("test_user") is an operator, so this works diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml index 486f06731051..d84653003be3 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/140_user_profile.yml @@ -2,8 +2,11 @@ "Test User Profile feature will work in a mixed cluster (pre 8.5.0)": - skip: - features: node_selector - version: " - 7.99.99, 8.5.0 - " + cluster_features: ["gte_v8.5.0"] + reason: "Does not work pre 8.0 (#86373) and response format changed after 8.5 (#89023)" + - requires: + test_runner_features: node_selector + cluster_features: ["gte_v8.0.0"] reason: "Does not work pre 8.0 (#86373) and response format changed after 8.5 (#89023)" - do: @@ -34,8 +37,8 @@ --- "Test User Profile feature will work in a mixed cluster": - - skip: - version: " - 8.4.99" + - requires: + cluster_features: ["gte_v8.5.0"] reason: "response format is changed to support multiple UIDs #89023" - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml index aae8eb2367f7..924b4b17f1e7 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/150_profiling.yml @@ -1,7 +1,7 @@ --- "Test Profiling Index Management creates indices": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: status check API has been introduced with 8.11.0 - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml index 3dcc97edd620..3030529024f3 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml @@ -48,7 +48,7 @@ --- "Put job and datafeed with aggs in old cluster - pre-deprecated interval": - skip: - version: "7.1.99 - " + cluster_features: ["gte_v7.1.99"] reason: "calendar_interval introduced in 7.2.0" - do: @@ -118,9 +118,10 @@ --- "Put job and datafeed with aggs in old cluster - deprecated interval with warning before 8.0.0": - skip: - version: "8.0.0 - " + cluster_features: ["gte_v8.0.0"] reason: at version 8.0.0, deprecation warnings don't occur on get_stats - features: warnings + - requires: + test_runner_features: warnings - do: ml.put_job: @@ -192,8 +193,8 @@ --- "Put job and datafeed with aggs in old cluster - deprecated interval with warning after 8.0.0": - - skip: - version: " - 7.99.99" + - requires: + cluster_features: ["gte_v8.0.0"] reason: at version 8.0.0, deprecation warnings don't occur on get_stats - do: diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml index 0439ac4b0206..2bb3c78feb84 100644 --- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml +++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/150_profiling.yml @@ -1,7 +1,7 @@ --- "Test Profiling Index Management updates indices": - - skip: - version: " - 8.10.99" + - requires: + cluster_features: ["gte_v8.11.0"] reason: status check API has been introduced with 8.11.0 - do: diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml index acb52ad1a327..a88f67b39478 100644 --- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml +++ b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml @@ -1,9 +1,7 @@ --- setup: - - skip: - version: "9.0.0 - " - reason: "compatible from 8.x to 7.x" - features: + - requires: + test_runner_features: - "headers" - "warnings_regex"