Fixes in master.yaml and pipeline.yaml

Author: ferdingler

cloudformation/master.yaml

@@ -69,7 +69,7 @@ Resources:
       TemplateURL: "https://s3.amazonaws.com/load-testing-using-aws-fargate/artifacts/templates/pipeline.yaml"
       Parameters:
         DockerRegistryArn: !GetAtt DockerRegistry.Arn
-        MasterStackId: !Ref AWS::StackId
+        MasterStackId: !Ref 'AWS::StackName'
         GitRepositoryName: !Ref GitRepositoryName
         DockerRegistryURL: !Join
           - ''

cloudformation/pipeline.yaml

@@ -47,7 +47,6 @@ Resources:
   # into the ECR Registry.
   CodeBuild:
     Type: AWS::CodeBuild::Project
-    DependsOn: BuildAndPipelinePolicy
     Properties:
       Description: Builds distributed load testing suite
       TimeoutInMinutes: 20
@@ -87,7 +86,6 @@ Resources:
   # execution of Fargate tasks into the different regions.
   LoadTestRunner:
     Type: AWS::CodeBuild::Project
-    DependsOn: BuildAndPipelinePolicy
     Properties:
       Description: Runs the load tests in Fargate
       ServiceRole: !GetAtt CodeBuildRole.Arn
@@ -97,16 +95,16 @@ Resources:
         Type: LINUX_CONTAINER
         ComputeType: BUILD_GENERAL1_SMALL
         Image: "aws/codebuild/python:3.6.5"
-      EnvironmentVariables:
-        -
-          Name: TASK_COUNT
-          Value: !Ref ContainersPerRegion
-        -
-          Name: REGION_1
-          Value: !Ref AWS::Region
-        -
-          Name: REGION_1_STACK_NAME
-          Value: !Ref MasterStackId
+        EnvironmentVariables:
+          -
+            Name: "TASK_COUNT"
+            Value: !Ref ContainersPerRegion
+          -
+            Name: "REGION_1"
+            Value: !Ref 'AWS::Region'
+          -
+            Name: "REGION_1_STACK_NAME"
+            Value: !Ref MasterStackId
       Source:
         Type: CODEPIPELINE
         BuildSpec: !Sub |