diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-02-03 12:57:06 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-02-03 12:57:06 -0800 |
| commit | 5b06a6d96f8199f01a3ed7e01f4a5b86dc589c92 (patch) | |
| tree | 094181596dbd54d090e71ee4fb79bb928165d831 | |
| parent | d1d77e9d535afae1326b07d2f53092fa58132c95 (diff) | |
| download | chef-5b06a6d96f8199f01a3ed7e01f4a5b86dc589c92.tar.gz | |
Update docs for forking the stable branch
Make sure the external tests continue to work.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | docs/dev/how_to/bumping_the_major_version.md | 1 | ||||
| -rwxr-xr-x | tasks/bin/run_external_test | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/dev/how_to/bumping_the_major_version.md b/docs/dev/how_to/bumping_the_major_version.md index 446b927217..f9db9e525e 100644 --- a/docs/dev/how_to/bumping_the_major_version.md +++ b/docs/dev/how_to/bumping_the_major_version.md @@ -35,6 +35,7 @@ Once you’ve forked to a new stable branch such as `chef-15` you’ll want to c - In readme.md update the buildkite badge to point to the new stable branch image and link instead of pointing to master. - In kitchen-tests/Gemfile update the Ohai branch to point to the new Ohai stable - In kitchen-tests/kitchen.yml update chef_version to be your new stable version and not current. Ex: 15 +- In tasks/bin/run_external_test update the ohai branch to point to your new stable ohai branch - In Gemfile set ohai to pull from the ohai stable branch - Run `rake dependencies:update` diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test index 90cf9e2e0c..889c5bbb15 100755 --- a/tasks/bin/run_external_test +++ b/tasks/bin/run_external_test @@ -21,7 +21,7 @@ build_dir = Dir.pwd env = { "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \ - "gem 'ohai', git: 'https://github.com/chef/ohai.git'", + "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: 'master'", "CHEF_LICENSE" => "accept-no-persist", } |