summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-17 22:13:13 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-18 14:21:02 -0700
commita80c5cf9e7b373b7f41868f476ef2f689b3a0fbc (patch)
treeee17be03194e70d31cfae4cb2b7d7ee0ab1aba45
parentfca6cdc1f399ecf884ea1e30f3401f1dbff5705c (diff)
downloadchef-a80c5cf9e7b373b7f41868f476ef2f689b3a0fbc.tar.gz
Don't bundle install on tests
-rw-r--r--Gemfile2
-rwxr-xr-xci/verify-chef.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index ab1b5d11f5..74099131ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ group(:maintenance) do
end
# Everything except AIX
-group(:linux, :bsd, :mac_os_x, :solaris, :windows, :ruby_prof) do
+group(:linux, :bsd, :mac_os_x, :solaris, :windows) do
# may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
gem "ruby-prof"
end
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index cc95142d04..47f9faa31c 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -124,6 +124,6 @@ else
fi
# TODO Fix Solaris and AIX so we don't have to do GIT_SSL_NO_VERIFY=true
- sudo env BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 BUNDLE_WITHOUT=docgen:maintenance:omnibus_package:integration GIT_SSL_NO_VERIFY=true PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle install
+ # sudo env BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 BUNDLE_WITHOUT=docgen:maintenance:omnibus_package:integration GIT_SSL_NO_VERIFY=true PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle install
sudo env BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 BUNDLE_WITHOUT=docgen:maintenance:omnibus_package:integration GIT_SSL_NO_VERIFY=true PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional
fi