summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn <john.mccrae@progress.com>2023-04-19 16:52:34 -0700
committerJohn <john.mccrae@progress.com>2023-04-19 16:52:34 -0700
commit0a75bed13bdd44efd79e70d4436f2e9176b29f8d (patch)
tree8fb9fb11f290845e33365b8e2db335a8d94a9da6
parent29c2943bd110488650e0601d80c4b9cb7b4c00eb (diff)
downloadchef-jfm/chef17_berkshelf.tar.gz
Using an update from Main branchjfm/chef17_berkshelf
Signed-off-by: John <john.mccrae@progress.com>
-rw-r--r--omnibus/Gemfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index ca5e4f2339..0ca7911a0f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -6,13 +6,17 @@ gem "artifactory"
gem "pedump"
+# Use Berkshelf for resolving cookbook dependencies
+# Using a branch here that calls out a berkshelf version for chef-17
+# Bershelf isn't under active development. We need to retire this thing at some point
+gem "berkshelf", git: "https://github.com/chef/berkshelf.git", branch: "main"
+
# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
# by running `bundle config set --local without development && bundle install` to speed up build times.
group :development do
# Use Berkshelf for resolving cookbook dependencies
- gem "berkshelf", ">= 7.0"
# Use Test Kitchen with Vagrant for converging the build environment
gem "test-kitchen", ">= 1.23"