[DFSM] On cluster update, remove the check on static fleet and move the cluster readiness check before clustermgtd is restarted.

Signed-off-by: Giacomo Marciani <[email protected]>

Author: gmarciani

cookbooks/aws-parallelcluster-slurm/recipes/update/update_head_node.rb

@@ -278,6 +278,8 @@ def update_nodes_in_queue(strategy, queues)
 
 chef_sleep '15'
 
+wait_cluster_ready
+
 execute 'start clustermgtd' do
   command "#{cookbook_virtualenv_path}/bin/supervisorctl start clustermgtd"
   not_if { ::File.exist?(node['cluster']['previous_cluster_config_path']) && !are_queues_updated? && !are_bulk_custom_slurm_settings_updated? }
@@ -289,7 +291,3 @@ def update_nodes_in_queue(strategy, queues)
   cookbook 'aws-parallelcluster-environment'
   mode '0644'
 end
-
-wait_static_fleet_running
-
-wait_cluster_ready

cookbooks/aws-parallelcluster-slurm/spec/unit/recipes/update_head_node_spec.rb

@@ -32,10 +32,6 @@
         )
       end
 
-      it 'checks that the static fleet is running' do
-        is_expected.to run_ruby_block("wait for static fleet capacity")
-      end
-
       it 'checks cluster readiness' do
         expected_command = "#{cookbook_venv_path}/bin/python #{scripts_dir}/head_node_checks/check_cluster_ready.py" \
           " --cluster-name #{cluster_name}" \