summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--acceptance/Gemfile3
-rw-r--r--acceptance/Gemfile.lock16
2 files changed, 8 insertions, 11 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 1cbc072373..b466cd0f07 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -15,4 +15,5 @@ gem "berkshelf"
# packages are not always immediately available via the omnitruck API.
gem "mixlib-install", "1.2.3"
-gem "chef-config", path: "../chef-config"
+# for chef-13 development - pin to the released rubygems version
+gem "chef-config", "< 13.0"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index df0f6f9a32..6d2bc0572d 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -6,15 +6,6 @@ GIT
mixlib-shellout (~> 2.0)
thor (~> 0.19)
-PATH
- remote: ../chef-config
- specs:
- chef-config (13.0.15)
- addressable
- fuzzyurl
- mixlib-config (~> 2.0)
- mixlib-shellout (~> 2.0)
-
GEM
remote: https://rubygems.org/
specs:
@@ -64,6 +55,11 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
+ chef-config (12.19.36)
+ addressable
+ fuzzyurl
+ mixlib-config (~> 2.0)
+ mixlib-shellout (~> 2.0)
cleanroom (1.0.0)
coderay (1.1.1)
diff-lcs (1.3)
@@ -254,7 +250,7 @@ PLATFORMS
DEPENDENCIES
berkshelf
chef-acceptance!
- chef-config!
+ chef-config (< 13.0)
inspec
kitchen-ec2
kitchen-inspec