diff options
author | Tim Smith <tsmith84@gmail.com> | 2021-08-24 15:35:36 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2021-08-24 15:35:36 -0700 |
commit | da97d2039b91c0e6901b27f63e0214514a52f67f (patch) | |
tree | b6046f3f53428693379df75bdd91acecbcba2c1d | |
parent | db3871fed9c6b4e6835f6c3ec89f5bab2e294015 (diff) | |
download | chef-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>
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | kitchen-tests/Gemfile | 4 | ||||
-rw-r--r-- | kitchen-tests/README.md | 6 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c49a24b597..36ea977f27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM net-ssh (>= 5.0.0, < 7.0.0) net-ssh (6.1.0) nori (2.6.0) - parallel (1.20.1) + parallel (1.20.2) parser (3.0.2.0) ast (~> 2.4.1) parslet (1.8.2) @@ -420,6 +420,7 @@ GEM wmi-lite (1.0.5) PLATFORMS + arm64-darwin-20 ruby x64-mingw32 x86-mingw32 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 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 1a2be29b48..e269e8f647 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -33,7 +33,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.1.1) - aws-partitions (1.489.0) + aws-partitions (1.490.0) aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -309,7 +309,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.20.1) + parallel (1.20.2) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) |