summaryrefslogtreecommitdiff
path: root/omnibus/config/software/chef.rb
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-18 13:37:52 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-18 14:21:02 -0700
commit4ac5018092e0dcd4fefa1813cc99ce7cc393b2f2 (patch)
tree0c1ec15e4c92e49abc5adebbaadfe7cf6d9c62c4 /omnibus/config/software/chef.rb
parent9971604ce1556585552a95c937f59355316f3294 (diff)
downloadchef-4ac5018092e0dcd4fefa1813cc99ce7cc393b2f2.tar.gz
Don't update fips serverspec Gemfile.lock
Diffstat (limited to 'omnibus/config/software/chef.rb')
-rw-r--r--omnibus/config/software/chef.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/omnibus/config/software/chef.rb b/omnibus/config/software/chef.rb
index 4b4e9c2850..49db136e94 100644
--- a/omnibus/config/software/chef.rb
+++ b/omnibus/config/software/chef.rb
@@ -57,17 +57,17 @@ build do
require_relative "../../files/chef/build-chef"
extend BuildChef
- chef_build_env = env.dup
- chef_build_env["BUNDLE_GEMFILE"] = chef_gemfile
+ project_env = env.dup
+ project_env["BUNDLE_GEMFILE"] = project_gemfile
# Prepare to install: build config, retries, job, frozen=true
# TODO Windows install seems to sometimes install already-installed gems such
# as gherkin (and fail as a result) if you use jobs > 1.
- create_bundle_config(chef_gemfile, retries: 4, jobs: windows? ? 1 : 7, frozen: true)
+ create_bundle_config(project_gemfile, retries: 4, jobs: windows? ? 1 : 7, frozen: true)
# Install all the things. Arguments are specified in .bundle/config (see create_bundle_config)
block { log.info(log_key) { "" } }
- bundle "install --verbose", env: chef_build_env
+ bundle "install --verbose", env: project_env
# For whatever reason, nokogiri software def deletes this (rather small) directory
block { log.info(log_key) { "" } }
@@ -78,7 +78,7 @@ build do
# Check that it worked
block { log.info(log_key) { "" } }
- bundle "check", env: chef_build_env
+ bundle "check", env: project_env
# fix up git-sourced gems
properly_reinstall_git_and_path_sourced_gems