Merge branch 'develop' into upgrade-dcv

CHANGELOG.md

@@ -29,7 +29,7 @@ CHANGELOG
 **BUG FIXES**
 - Fix an issue where changes in sequence of custom actions scripts were not detected during cluster updates.
 - Add missing permissions for ParallelCluster API to create the service linked roles for Elastic Load Balancing and Auto Scaling, that are required to deploy login nodes.
-- Fix an issue in the way we get region when manage volumes so that it can correctly handle local zone.
+- Fix retrieval of regions when managing volumes to correctly handle local zones.
 - Fix an issue where adding EFS filesystems with AccessPointIds during an update would fail.
 - Fix an issue where when using PCAPI, cluster update could fail when updating a parameter that is not type `String` (e.g. `MaxCount`).
 - When mounting an external OpenZFS, it is no longer required to set the outbound rules for ports 111, 2049, 20001, 20002, 20003.

tests/integration-tests/tests/pcluster_api/test_api.py

@@ -302,6 +302,7 @@ def _test_cluster_workflow(
     with open(updated_config_file, encoding="utf-8") as config_file:
         updated_cluster_config = config_file.read()
     _test_update_cluster(region, cluster_operations_client, cluster_name, updated_cluster_config)
+    cluster.wait_cluster_status("UPDATE_COMPLETE")
 
     head_node = _test_describe_cluster_head_node(region, cluster_instances_client, cluster_name)
     compute_node_map = _test_describe_cluster_compute_nodes(region, cluster_instances_client, cluster_name)