[SQUASH] AD stack quarantine.

Author: gmarciani

tests/integration-tests/cfn_stacks_factory.py

@@ -31,13 +31,14 @@
 class CfnStack:
     """Identify a CloudFormation stack."""
 
-    def __init__(self, name, region, template, parameters=None, capabilities=None, tags=None):
+    def __init__(self, name, region, template, parameters=None, capabilities=None, tags=None, disable_rollback=False):
         self.name = name
         self.region = region
         self.template = template
         self.parameters = parameters or []
         self.capabilities = capabilities or []
         self.tags = tags or []
+        self.disable_rollback=disable_rollback
         self.cfn_stack_id = None
         self.__cfn_outputs = None
         self.__cfn_resources = None
@@ -175,6 +176,7 @@ def create_stack(self, stack, stack_is_under_test=False):
                         Parameters=stack.parameters,
                         Capabilities=stack.capabilities,
                         Tags=stack.tags,
+                        DisableRollback=stack.disable_rollback,
                     )
                 else:
                     result = cfn_client.create_stack(
@@ -183,6 +185,7 @@ def create_stack(self, stack, stack_is_under_test=False):
                         Parameters=stack.parameters,
                         Capabilities=stack.capabilities,
                         Tags=stack.tags,
+                        DisableRollback=stack.disable_rollback,
                     )
                 stack.cfn_stack_id = result["StackId"]
                 self.__created_stacks[id] = stack

tests/integration-tests/tests/ad_integration/test_ad_integration.py

@@ -27,6 +27,8 @@
 from remote_command_executor import RemoteCommandExecutor
 from retrying import retry
 from time_utils import seconds
+
+from pcluster.models.imagebuilder_resources import StackError
 from utils import find_stack_by_tag, generate_stack_name, is_directory_supported, random_alphanumeric
 
 from tests.ad_integration.cluster_user import ClusterUser
@@ -218,6 +220,7 @@ def _create_directory_stack(cfn_stacks_factory, request, directory_type, region,
             parameters=stack_parameters,
             capabilities=["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"],
             tags=tags,
+            disable_rollback=True,
         )
     try:
         cfn_stacks_factory.create_stack(directory_stack, stack_is_under_test=True)
@@ -227,7 +230,9 @@ def _create_directory_stack(cfn_stacks_factory, request, directory_type, region,
         # We retain a limited number of stack to contain the costs.
         n_retained_ad_stacks = get_retained_ad_stacks_count()
         if n_retained_ad_stacks < MAX_QUARANTINED_STACKS:
-            logging.warn("Retaining failed stack %s to debug failure", directory_stack_name)
+            logging.warn("Retaining failed stack %s to debug failure (retained: %d, max: %d)",
+                         directory_stack_name, n_retained_ad_stacks, MAX_QUARANTINED_STACKS)
+
             add_tag_to_stack(directory_stack.name, DO_NOT_DELETE_TAG_KEY, "Retained to debug failure")
         else:
             logging.warn("Cannot retain failed stack %s for debugging because there are already %d retained (max: %d)",