Merge branch 'develop' into master

JiaDe-Wu · May 16, 2019 · 9036d4c · 9036d4c
2 parents 8db5c3e + f3c2d9b
commit 9036d4c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/ci/config.yml b/ci/config.yml
@@ -20,8 +20,8 @@ global:
 
 tests:
   quickstart-ct-clickstream-analyticst1:
-    parameter_input: quickstart-ct-clickstream-analytics-example-params1.json
-    template_file: quickstart-ct-clickstream-analytics-example1.template
+    parameter_input: clickstream-analytics-input-novpc.json
+    template_file: quickstart-ct-clickstream-analytics.template
   quickstart-ct-clickstream-analyticst2:
-    parameter_input: quickstart-ct-clickstream-analytics-example-params2.json
-    template_file: quickstart-ct-clickstream-analytics-example2.template
+    parameter_input: clickstream-analytics-input-withvpc.json
+    template_file: quickstart-ct-clickstream-analytics-master.template
diff --git a/ci/taskcat.yml b/ci/taskcat.yml
@@ -1,23 +1,23 @@
 global:
-  owner: atangirala@ctepl.com
-  qsname: quickstart-clickstream-analytics-ct
+  owner: quickstart@amazon.com
+  qsname: quickstart-ct-clickstream-analytics
   #s3bucket: projectx-templates <- (Optional) Only needed if you want to use a specific bucket
   regions:
-    - us-east-2
+    - us-west-2
   reporting: true
 tests:
-  # The following test will test in us-east-2 using clickstream-analytics-input-novpc.json as inputs
+  # The following test will test in us-west-2 using clickstream-analytics-input-novpc.json as inputs
   scenario-1:
     regions:
-      - us-east-2
-    template_file: clickstream-analytics.template
+      - us-west-2
+    template_file: quickstart-ct-clickstream-analytics.template
     parameter_input: clickstream-analytics-input-novpc.json
   scenario-2:
     regions:
-      - us-east-2
-    template_file: clickstream-analytics-master.template
+      - us-west-2
+    template_file: quickstart-ct-clickstream-analytics-master.template
     parameter_input: clickstream-analytics-input-withvpc.json
-  # The following test will test in both all us-east-2 region defined in the global region section using clickstream-analytics-input-withvpc.json as inputs
+  # The following test will test in both all us-west-2 region defined in the global region section using clickstream-analytics-input-withvpc.json as inputs
       #scenario-all-regions:
     #parameter_input: clickstream-analytics-input-withvpc.json
-    #template_file: clickstream-analytics-master.template
+    #template_file: quickstart-ct-clickstream-analytics-master.template