Merge pull request #364 from code-dot-org/smoketest

Run smoke tests after prod deploy

Author: cat5inthecradle

cicd/2-cicd/cicd.template.yml

@@ -395,6 +395,28 @@ Resources:
                   Capabilities: CAPABILITY_AUTO_EXPAND
                   RoleArn: !Sub arn:aws:iam::${AWS::AccountId}:role/admin/CloudFormationService
           - !Ref AWS::NoValue
+
+        - !If
+          - DeployForProduction
+          - Name: Smoke_Test
+            Actions:
+              - Name: smoke-test
+                ActionTypeId:
+                  Category: Build
+                  Owner: AWS
+                  Provider: CodeBuild
+                  Version: 1
+                InputArtifacts:
+                  - Name: sourceCode
+                Configuration:
+                  ProjectName: !Ref IntegrationTestBuildProject
+                  EnvironmentVariables: !Sub
+                    - '[{"name":"APP_SUBDOMAIN","value":"${SUBDOMAIN}","type":"PLAINTEXT"},{"name":"APP_BASE_DOMAIN","value":"${BASE_DOMAIN}","type":"PLAINTEXT"}]'
+                    - BASE_DOMAIN: code.org
+                      SUBDOMAIN: !If [TargetsMainBranch, "javabuilder", !Sub "javabuilder-${GitHubBranch}"]
+                OutputArtifacts:
+                  - Name: smokeTestResults
+          - !Ref AWS::NoValue
 
   # Send pipeline events to an SNS topic.
   # Note:

cicd/3-app/javabuilder/template.yml.erb

@@ -645,25 +645,26 @@ Resources:
   HighUsageCompositeAlarm:
     Type: AWS::CloudWatch::CompositeAlarm
     DependsOn:
+      - ConsoleHighInvocationsAlarm
       - HighHttpRequestsAlarm
-      -  HighWebsocketConnectionsAlarm
-      -  NeighborhoodHighInvocationsAlarm
-      -  TheaterHighInvocationsAlarm
+      - HighWebsocketConnectionsAlarm
+      - NeighborhoodHighInvocationsAlarm
+      - TheaterHighInvocationsAlarm
     Properties:
         ActionsEnabled: true
         AlarmActions:
-            # TODO: after we have run at high usage for a while, consider re-enabling this alarm. Right now it is too noisy
-            # - !If [SilenceAlertsCondition, !Ref AWS::NoValue, !Sub "arn:aws:sns:${AWS::Region}:${AWS::AccountId}:javabuilder-high-usage"]
-            - !Ref AWS::NoValue
+          # TODO: after we have run at high usage for a while, consider re-enabling this alarm. Right now it is too noisy
+          # - !If [SilenceAlertsCondition, !Ref AWS::NoValue, !Sub "arn:aws:sns:${AWS::Region}:${AWS::AccountId}:javabuilder-high-usage"]
+          - !Ref AWS::NoValue
         AlarmDescription: Send message if abnormally high Javabuilder usage detected.
-            Monitors usage across the HTTP API, WebSocket API, and all Build and Run
-            Lambdas.
+          Monitors usage across the HTTP API, WebSocket API, and all Build and Run
+          Lambdas.
         AlarmName: !Sub "${SubDomainName}_high_usage_composite"
         AlarmRule: !Sub "ALARM(${SubDomainName}_console_high_invocations) OR
-            ALARM(${SubDomainName}_high_http_requests) OR
-            ALARM(${SubDomainName}_high_websocket_connections) OR
-            ALARM(${SubDomainName}_neighborhood_high_invocations) OR
-            ALARM(${SubDomainName}_theater_high_invocations)"
+          ALARM(${SubDomainName}_high_http_requests) OR
+          ALARM(${SubDomainName}_high_websocket_connections) OR
+          ALARM(${SubDomainName}_neighborhood_high_invocations) OR
+          ALARM(${SubDomainName}_theater_high_invocations)"
         InsufficientDataActions: []
         OKActions: []