summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-08-24 15:35:36 -0700
committerTim Smith <tsmith84@gmail.com>2021-08-24 15:35:36 -0700
commitda97d2039b91c0e6901b27f63e0214514a52f67f (patch)
treeb6046f3f53428693379df75bdd91acecbcba2c1d /kitchen-tests
parentdb3871fed9c6b4e6835f6c3ec89f5bab2e294015 (diff)
downloadchef-da97d2039b91c0e6901b27f63e0214514a52f67f.tar.gz
Fix Test Kitchen tests
Cutover some branches and update some docs while I'm here Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Gemfile4
-rw-r--r--kitchen-tests/README.md6
2 files changed, 5 insertions, 5 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 19f6e7d93e..6a5301bdaa 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -3,9 +3,9 @@ source "https://rubygems.org"
gem "rake" # required to build some native extensions
gem "chef", path: ".."
gem "knife", path: "../knife"
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" # 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-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
+gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "main"
gem "inspec"
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 99ab9b0cfe..a997dc4370 100644
--- a/kitchen-tests/README.md
+++ b/kitchen-tests/README.md
@@ -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 [Buildkite](https://buildkite.com/chef-oss/chef-chef-master-verify).
+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 [Buildkite](https://buildkite.com/chef-oss/chef-chef-main-verify).
### Commands
@@ -60,13 +60,13 @@ The provisioner can be configured to pull client source code from a GitHub repos
By default, the provisioner is configured to pull your most recent commit to `chef/chef`. You can change this by modifying the `github` and `branch` provisioner options:
- `github`: Set this to `"<your_username>/<your_chef_repo>"`. The default is `"chef/chef"`.
-- `branch`: This can be any valid git reference (e.g., branch name, tag, or commit SHA). If omitted, it defaults to `master`.
+- `branch`: This can be any valid git reference (e.g., branch name, tag, or commit SHA). If omitted, it defaults to `main`.
The branch you choose must be accessible on GitHub. You cannot use a local commit at this time.
### Testing pull requests
-These end-to-end tests are also configured to run on Buildkite 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 Buildkite with Docker containers when you submit a pull request to `chef/chef`. Test Kitchen is configured to pull Chef Infra Client source code from the branch it is testing. There is no need to modify `kitchen.yml` unless you are contributing tests.
## Contributing