Skip to content

Commit ec429af

Browse files
committed
[CI] Test Runner: Change orders for wipe_cluster
1 parent 968fec8 commit ec429af

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

api-spec-testing/test_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ class << self
181181
def wipe_cluster(client)
182182
if xpack?
183183
clear_rollup_jobs(client)
184-
clear_sml_policies(client)
185184
wait_for_pending_tasks(client)
185+
clear_sml_policies(client)
186186
end
187187
clear_snapshots_and_repositories(client)
188188
clear_datastreams(client) if xpack?

elasticsearch-xpack/spec/xpack/rest_api_yaml_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
# todo: remove these two lines when Dimitris' PR is merged
5757
ADMIN_CLIENT.cluster.put_settings(body: { transient: { 'xpack.ml.max_model_memory_limit' => nil } })
5858
ADMIN_CLIENT.cluster.put_settings(body: { persistent: { 'xpack.ml.max_model_memory_limit' => nil } })
59-
Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
6059
test_file.setup
6160
end
6261

6362
after(:all) do
6463
test_file.teardown
64+
Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
6565
end
6666

6767
test.task_groups.each do |task_group|

0 commit comments

Comments
 (0)