Merge pull request #74 from olhado/fixes

Update docs and remove unused file

Author: olhado

.kitchen.ec2.yml

@@ -7,5 +7,5 @@ We encourage anyone to provide enchancements/fixes to this repository. Simply fo
 ### What makes a good PR?
 
 * Make sure you update the README.md with any new/removed/changed values parameters.
-* Write tests that cover your proposed changes.
+* Write tests that cover your proposed changes. (See the [TESTING](TESTING.md) documentation)
 * Make sure the tests documented in the [README](README.md) run as expected on all platforms.

CONTRIBUTING.md

@@ -32,7 +32,6 @@ The following Opscode cookbooks are dependencies:
 * `apt`
 * `yum`
 
-
 Recipes
 =======
 

README.md

@@ -30,36 +30,25 @@ bundle exec rake
 
 ### Integration Tests
 
-This tests a number of different suites, some of which require special credentials or virtual machine configurations.
-Integration tests are setup to run under test-kitchen:
+This tests a number of different integration test suites using docker containers. They are
+setup to run under test-kitchen:
 
 Requirements:
 To run integration testing you need a valid threatstack agent deployment key
 Get your deployment key from the Threat Stack application under "Settings" -> "Applications Keys"
 
+**Example:**
 ```
 export TS_DEPLOY_KEY=<deploy key>
 export TS_CONFIG_ARGS=['fim.log yes']
 ```
 
-Vagrant/local integration testing
+Local container integration testing
 ---------------
-Vagrant testing through the Kitchen-CI toolset can be done locally. You must have VirtualBox and vagrant installed.
+Container (with docker) testing through the Kitchen-CI toolset can be done locally. You must have
+docker installed. The `.kitchen.yml` file drives the configuration and execution of the tests.
 
 To run tests, use the kitchen framework. The following will run all tests:
 ```
 bundle exec kitchen test
 ```
-
-Using ec2 nodes through vagrant
-----------------------------------------
-This approach to integration testing will allow you to use custom nodes, or cloud-specific nodes. (The most common case is Amazon Linux 1 and 2).
-
-To test using ec2 instead of VirtualBox nodes, use the `.kitchen.ec2.yml` configuration file. You may need additional environment variables set for those tests (such as `AWS_SECRET_ACCESS_KEY`, `AWS_ACCESS_KEY_ID`, `AWS_SSH_KEY`, `SG_GROUP_IDS`, `SG_SUBNET_ID`, or `IMAGE_OWNER_ID`. 
-
-You may not need all of those, but you likely need the AWS- ones for native kitchen-ec2 provisioning. 
-
-To run tests on the EC2 kitchen file, run commands as follows: 
-```
-KITCHEN_YAML=".kitchen.ec2.yml" bundle exec kitchen test
-```