make tests more stable: keep timeouts in sync

Author: michaelwittig

ecs/cluster-cost-optimized.yaml

@@ -809,7 +809,7 @@ Resources:
       MinSize: !Ref MinSize
       MaxSize: !Ref MaxSize
       Cooldown: '600'
-      HealthCheckGracePeriod: 300
+      HealthCheckGracePeriod: 900 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       TargetGroupARNs:
       - !Ref DefaultTargetGroup

ecs/cluster.yaml

@@ -855,7 +855,7 @@ Resources:
       MinSize: !Ref MinSize
       MaxSize: !Ref MaxSize
       Cooldown: '120'
-      HealthCheckGracePeriod: 300
+      HealthCheckGracePeriod: 900 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       TargetGroupARNs:
       - !Ref DefaultTargetGroup

jenkins/jenkins2-ha-agents.yaml

@@ -1329,7 +1329,7 @@ Resources:
       LaunchConfigurationName: !Ref MasterLC
       MinSize: '1'
       MaxSize: '1'
-      HealthCheckGracePeriod: 900
+      HealthCheckGracePeriod: 1800 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       NotificationConfigurations: !If
       - HasAlertTopic
@@ -2038,7 +2038,7 @@ Resources:
       LaunchConfigurationName: !Ref AgentLC
       MinSize: !Ref AgentMinSize
       MaxSize: !Ref AgentMaxSize
-      HealthCheckGracePeriod: 600
+      HealthCheckGracePeriod: 900 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       TargetGroupARNs:
       - !Ref AgentELBTargetGroup

jenkins/jenkins2-ha.yaml

@@ -979,7 +979,7 @@ Resources:
       LaunchConfigurationName: !Ref MasterLC
       MinSize: '1'
       MaxSize: '1'
-      HealthCheckGracePeriod: 900
+      HealthCheckGracePeriod: 1800 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       NotificationConfigurations: !If
       - HasAlertTopic

security/auth-proxy-ha-github-orga.yaml

@@ -765,7 +765,7 @@ Resources:
       LaunchConfigurationName: !Ref LaunchConfiguration
       MaxSize: '1'
       MinSize: '1'
-      HealthCheckGracePeriod: 300
+      HealthCheckGracePeriod: 600 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       Tags:
       - Key: Name

test/src/test/java/de/widdix/awscftemplates/ACloudFormationTest.java

@@ -207,12 +207,12 @@ protected final void deleteStack(final Context context, final String stackName)
                 System.out.println("Skip stack deletion because of stack failure in context and FAILURE_POLICY := retain");
             } else {
                 this.cf.deleteStack(new DeleteStackRequest().withStackName(stackName));
+                if (Config.has(Config.Key.BUCKET_NAME)) {
+                    final AmazonS3 s3local = AmazonS3ClientBuilder.standard().withCredentials(this.credentialsProvider).withRegion(Config.get(Config.Key.BUCKET_REGION)).build();
+                    s3local.deleteObject(Config.get(Config.Key.BUCKET_NAME), stackName);
+                }
+                this.waitForStack(context, stackName, FinalStatus.DELETE_COMPLETE);
             }
-            if (Config.has(Config.Key.BUCKET_NAME)) {
-                final AmazonS3 s3local = AmazonS3ClientBuilder.standard().withCredentials(this.credentialsProvider).withRegion(Config.get(Config.Key.BUCKET_REGION)).build();
-                s3local.deleteObject(Config.get(Config.Key.BUCKET_NAME), stackName);
-            }
-            this.waitForStack(context, stackName, FinalStatus.DELETE_COMPLETE);
         }
     }
 

wordpress/wordpress-ha-aurora.yaml

@@ -988,7 +988,7 @@ Resources:
       MinSize: '2'
       MaxSize: '4'
       Cooldown: '60'
-      HealthCheckGracePeriod: 300
+      HealthCheckGracePeriod: 600 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       NotificationConfigurations: !If
       - HasAlertTopic

wordpress/wordpress-ha.yaml

@@ -967,7 +967,7 @@ Resources:
       MinSize: '2'
       MaxSize: '4'
       Cooldown: '60'
-      HealthCheckGracePeriod: 300
+      HealthCheckGracePeriod: 600 # needs to be in sync with CreationPolicy/UpdatePolicy timeout
       HealthCheckType: ELB
       NotificationConfigurations: !If
       - HasAlertTopic