Merge branch 'develop' into feature/nat-gateway-everywhere. Update VPC template to deprecate KeyPairName and NATInstanceType instead of completely removing them.

vsnyc · vsnyc · commit 42a3c1d735c1 · 2018-09-20T17:00:14.000-04:00
diff --git a/ci/aws-vpc-3az-complete.json b/ci/aws-vpc-3az-complete.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-3az-public.json b/ci/aws-vpc-3az-public.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-3az.json b/ci/aws-vpc-3az.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-4az-complete.json b/ci/aws-vpc-4az-complete.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-4az-public.json b/ci/aws-vpc-4az-public.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-4az.json b/ci/aws-vpc-4az.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-complete.json b/ci/aws-vpc-complete.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-dedicated.json b/ci/aws-vpc-dedicated.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "dedicated"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-defaults.json b/ci/aws-vpc-defaults.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/aws-vpc-public.json b/ci/aws-vpc-public.json
@@ -70,5 +70,9 @@
     {
         "ParameterKey": "VPCTenancy",
         "ParameterValue": "default"
+    },
+    {
+        "ParameterKey":"QSS3BucketName",
+        "ParameterValue":"$[taskcat_autobucket]"
     }
 ]
diff --git a/ci/taskcat.yml b/ci/taskcat.yml
@@ -0,0 +1,66 @@
+global:
+  govcloud: true
+  marketplace-ami: false
+  owner: quickstart@amazon.com
+  qsname: quickstart-aws-vpc
+  regions:
+    - ap-northeast-1
+    - ap-northeast-2
+    - ap-south-1
+    - ap-southeast-1
+    - ap-southeast-2
+    - ca-central-1
+    - eu-central-1
+    - eu-west-1
+    - eu-west-2
+    - sa-east-1
+    - us-east-1
+    - us-east-2
+    - us-west-1
+    - us-west-2
+  reporting: true
+tests:
+  defaults:
+    parameter_input: aws-vpc-defaults.json
+    template_file: aws-vpc.template
+  complete:
+    parameter_input: aws-vpc-complete.json
+    template_file: aws-vpc.template
+  public:
+    parameter_input: aws-vpc-public.json
+    template_file: aws-vpc.template
+  3az-eu-west-1:
+    parameter_input: aws-vpc-3az.json
+    regions:
+      - eu-west-1
+    template_file: aws-vpc.template
+  3az-complete-us-east-2:
+    parameter_input: aws-vpc-3az-complete.json
+    regions:
+      - us-east-2
+    template_file: aws-vpc.template
+  3az-public-us-west-2:
+    parameter_input: aws-vpc-3az-public.json
+    regions:
+      - us-west-2
+    template_file: aws-vpc.template
+  4az-us-east-1:
+    parameter_input: aws-vpc-4az.json
+    regions:
+      - us-east-1
+    template_file: aws-vpc.template
+  4az-complete-us-east-1:
+    parameter_input: aws-vpc-4az-complete.json
+    regions:
+      - us-east-1
+    template_file: aws-vpc.template
+  4az-public-us-east-1:
+    parameter_input: aws-vpc-4az-public.json
+    regions:
+      - us-east-1
+    template_file: aws-vpc.template
+  dedicated-us-west-1:
+    parameter_input: aws-vpc-dedicated.json
+    regions:
+      - us-west-1
+    template_file: aws-vpc.template

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,9 @@`
`70`	`70`	`{`
`71`	`71`	`"ParameterKey": "VPCTenancy",`
`72`	`72`	`"ParameterValue": "default"`
	`73`	`+ },`
	`74`	`+ {`
	`75`	`+ "ParameterKey":"QSS3BucketName",`
	`76`	`+ "ParameterValue":"$[taskcat_autobucket]"`
`73`	`77`	`}`
`74`	`78`	`]`