diff --git a/elasticsearch-api/api-spec-testing/wipe_cluster.rb b/elasticsearch-api/api-spec-testing/wipe_cluster.rb index 26fcab347..50daf5851 100644 --- a/elasticsearch-api/api-spec-testing/wipe_cluster.rb +++ b/elasticsearch-api/api-spec-testing/wipe_cluster.rb @@ -414,24 +414,27 @@ def clear_privileges(client) def clear_ml_jobs(client) client.ml.close_job(job_id: '_all', force: true) client.ml.get_jobs['jobs'].each do |d| - client.ml.delete_job(job_id: d['job_id']) + client.ml.delete_job(job_id: d['job_id'], wait_for_completion: false, force: true) end end def clear_datafeeds(client) client.ml.stop_datafeed(datafeed_id: '_all', force: true) client.ml.get_datafeeds['datafeeds'].each do |d| - client.ml.delete_datafeed(datafeed_id: d['datafeed_id']) + client.ml.stop_datafeed(datafeed_id: d['datafeed_id'], force: true) + begin + client.ml.delete_datafeed(datafeed_id: d['datafeed_id'], force: true) + rescue StandardError => e + logger.info(e) + end end end def clear_tasks(client) tasks = client.tasks.get['nodes'].values.first['tasks'].values.select do |d| d['cancellable'] - end.map do |d| - "#{d['node']}:#{d['id']}" end - tasks.each { |t| client.tasks.cancel task_id: t } + tasks.each { |d| client.tasks.cancel(task_id: "#{d['node']}:#{d['id']}") } end def clear_machine_learning_indices(client) @@ -448,7 +451,7 @@ def clear_index_templates(client) def clear_transforms(client) client.transform.get_transform(transform_id: '*')['transforms'].each do |transform| - client.transform.delete_transform(transform_id: transform['id']) + client.transform.delete_transform(transform_id: transform['id'], force: true) end end @@ -482,7 +485,7 @@ def delete_trained_models(client) return unless models['trained_model_configs'] models['trained_model_configs'].each do |model| - client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400) + client.ml.delete_trained_model(model_id: model['model_id'], force: true, ignore: 400, timeout: '120s') end end end diff --git a/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml b/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml index 91f9c8af6..be5581359 100644 --- a/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml +++ b/elasticsearch-api/spec/rest_api/skipped_tests_platinum.yml @@ -239,3 +239,92 @@ - :file: 'esql/60_usage.yml' :description: 'Basic ESQL usage output (telemetry) snapshot version' +# TODO: 8.19 - June 2025 +- + :file: 'ml/datafeeds_crud.yml' + :description: '*' +- + :file: 'ml/delete_job_force.yml' + :description: '*' +- + :file: 'ml/filter_crud.yml' + :description: '*' +- + :file: 'ml/get_datafeed_stats.yml' + :description: '*' +- + :file: 'ml/get_datafeeds.yml' + :description: '*' +- + :file: 'ml/get_trained_model_stats.yml' + :description: '*' +- + :file: 'ml/inference_crud.yml' + :description: '*' +- + :file: 'ml/job_groups.yml' + :description: '*' +- + :file: 'ml/jobs_crud.yml' + :description: '*' +- + :file: 'ml/jobs_get.yml' + :description: '*' +- + :file: 'ml/jobs_get_stats.yml' + :description: '*' +- + :file: 'ml/preview_data_frame_analytics.yml' + :description: '*' +- + :file: 'ml/preview_datafeed.yml' + :description: '*' +- + :file: 'ml/search_knn_query_vector_builder.yml' + :description: '*' +- + :file: 'ml/set_upgrade_mode.yml' + :description: '*' +- + :file: 'ml/sparse_vector_search.yml' + :description: '*' +- + :file: 'ml/start_data_frame_analytics.yml' + :description: '*' +- + :file: 'ml/start_stop_datafeed.yml' + :description: '*' +- + :file: 'ml/stop_data_frame_analytics.yml' + :description: '*' +- + :file: 'ml/text_embedding_search.yml' + :description: '*' +- + :file: 'ml/text_expansion_search.yml' + :description: '*' +- + :file: 'ml/text_expansion_search_rank_features.yml' + :description: '*' +- + :file: 'ml/text_expansion_search_sparse_vector.yml' + :description: '*' +- + :file: 'ml/trained_model_cat_apis.yml' + :description: '*' +- + :file: 'transform/transforms_crud.yml' + :description: '*' +- + :file: 'transform/transforms_start_stop.yml' + :description: '*' +- + :file: 'transform/transforms_stats.yml' + :description: '*' +- + :file: 'transform/transforms_update.yml' + :description: '*' +- + :file: 'transform/transforms_upgrade.yml' + :description: '*' +# ENDS TODO: 8.19 - June 2025