diff options
| author | Thomas Powell <104777878+tpowell-progress@users.noreply.github.com> | 2023-04-12 09:39:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 12:39:32 -0400 |
| commit | 34d438dc4a4131ad85aff7817e54c689249ef0b7 (patch) | |
| tree | 8e7b7571cf5352e8f225c8778e69b459416b93eb | |
| parent | dd131f30e12a17a83f46137066d6babff0f60710 (diff) | |
| download | chef-34d438dc4a4131ad85aff7817e54c689249ef0b7.tar.gz | |
Fix berkshelf on chef 17 (#13679)
Signed-off-by: Thomas Powell <powell@progress.com>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 4e9abe2b59..dcd8d5cc85 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -361,7 +361,7 @@ steps: - apt-get install -y graphviz - bundle config set --local without omnibus_package - bundle install --jobs=3 --retry=3 - - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake + - bundle exec tasks/bin/run_external_test chef/berkshelf main rake expeditor: executor: docker: diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 0a2fa1cee1..70f9506c23 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -4,7 +4,7 @@ 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: "17-stable" # avoids failures when we bump chef major -gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "main" +gem "berkshelf", git: "https://github.com/chef/berkshelf.git", branch: "main" gem "kitchen-dokken", ">= 2.0" gem "kitchen-vagrant", ">= 1.0" gem "kitchen-inspec" |