summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-22 10:36:51 -0700
committerTim Smith <tsmith@chef.io>2019-04-22 10:52:34 -0700
commitd6d240239eda45fb3abd263e582338a7860ba5c2 (patch)
tree998586a805d3c32276549d7c8162f9fc518c665f /kitchen-tests
parent1b7cf9dda96f876cac199a499597d27919a6aded (diff)
downloadchef-d6d240239eda45fb3abd263e582338a7860ba5c2.tar.gz
Nuke the other kitchen drivers from the gemfile
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Gemfile2
-rw-r--r--kitchen-tests/README.md8
2 files changed, 4 insertions, 6 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index fc01f7dded..c2437a307b 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -5,8 +5,6 @@ gem "chef", path: ".."
gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major
gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
gem "kitchen-dokken", "~> 2.0"
-gem "kitchen-docker", git: "https://github.com/test-kitchen/kitchen-docker.git", branch: "master"
gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
gem "inspec", git: "https://github.com/inspec/inspec.git", branch: "master" # this goes away when we ship inspec 4
-gem "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master"
gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master"
diff --git a/kitchen-tests/README.md b/kitchen-tests/README.md
index 9bf20a8fab..d87c3a0ecb 100644
--- a/kitchen-tests/README.md
+++ b/kitchen-tests/README.md
@@ -4,7 +4,7 @@ Here we seek to provide end-to-end testing of Chef Client through cookbooks whic
## Getting started
-These tests run in Docker containers so make sure to install Docker on your workstation. Once docker is installed all the gems needed to run these tests can be installed with Bundler.
+These tests run in Docker containers, so make sure to install Docker on your workstation. Once Docker is installed, all the gems needed to run these tests can be installed with Bundler.
```shell
chef/kitchen-tests$ bundle install
@@ -25,7 +25,7 @@ end-to-end-amazonlinux Dokken Dokken Inspec Dokken <Not Created
## Testing
-We use Test Kitchen to build instances, test client code, and destroy instances. If you are unfamiliar with Test Kitchen we recommend checking out the [tutorial](http://kitchen.ci/) along with the `kitchen-dokken` [driver documentation](https://github.com/someara/kitchen-dokken). Test Kitchen is configured to manipulate instances using [Docker](https://www.docker.com/) when testing locally and when testing pull requests on [Travis CI](https://travis-ci.com/).
+We use Test Kitchen to build instances, test client code, and destroy instances. If you are unfamiliar with Test Kitchen, we recommend checking out the [tutorial](http://kitchen.ci/) along with the `kitchen-dokken` [driver documentation](https://github.com/someara/kitchen-dokken). Test Kitchen is configured to manipulate instances using [Docker](https://www.docker.com/) when testing locally, and when testing, pull requests on [Travis CI](https://travis-ci.com/).
### Commands
@@ -53,7 +53,7 @@ To see a list of available commands, type `bundle exec kitchen help`. To see mor
### Configuring your tests
-Test Kitchen is configured in the `kitchen.yml` file which resides in this directory. You will need to configure the provisioner before running the tests.
+Test Kitchen is configured in the `kitchen.yml` file, which resides in this directory. You will need to configure the provisioner before running the tests.
The provisioner can be configured to pull client source code from a GitHub repository using any valid Git reference. You are encouraged to modify any of these settings, but please return them to their original values before submitting a pull request for review (unless, of course, your changes are enhancements to the default provisioner settings).
@@ -66,7 +66,7 @@ The branch you choose must be accessible on GitHub. You cannot use a local commi
### Testing pull requests
-These end-to-end tests are also configured to run on Travis-CI with docker containers when you submit a pull request to `chef/chef`. Kitchen is configured to pull chef client source code from the branch it is testing. There is no need to modify `kitchen.yml` unless you are contributing tests.
+These end-to-end tests are also configured to run on Travis-CI with Docker containers when you submit a pull request to `chef/chef`. Kitchen is configured to pull chef client source code from the branch it is testing. There is no need to modify `kitchen.yml` unless you are contributing tests.
## Contributing