summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-01-30 15:41:03 -0800
committerGitHub <noreply@github.com>2018-01-30 15:41:03 -0800
commitb949b64ea8998d1b5e2447bccd26bb33e622372a (patch)
tree5924d3b9c508c6ef2e9619f0416db3af32c55d56
parent4baf20262d22f984008e3d7a5ca0afbbbe4c0866 (diff)
parentb00b47223debd9856e86a09677da13c5b0304ea4 (diff)
downloadchef-b949b64ea8998d1b5e2447bccd26bb33e622372a.tar.gz
Merge pull request #6811 from chef/fix_docker_builds
Fix Dockerfile & Travis/Appveyor failures
-rw-r--r--.travis.yml111
-rw-r--r--Dockerfile4
-rw-r--r--spec/functional/mixin/powershell_out_spec.rb26
3 files changed, 87 insertions, 54 deletions
diff --git a/.travis.yml b/.travis.yml
index 9bfc173a77..c125b0220a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem --version
- rvm @global do gem uninstall bundler -a -x
+ # travis may preinstall a bundler gem which is later than the one which we pin, which may totally hose us, so we preemtively
+ # uninstall anything they may have installed here. if they haven't installed anything then we have to ignore the failure
+ # to uninstall the default bundler that ships embedded in ruby itself.
+ - rvm @global do gem uninstall bundler -a -x || true
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundle --version
- rm -f .bundle/config
@@ -33,24 +37,78 @@ env:
matrix:
include:
- - rvm: 2.2.8
+ - env:
+ INTEGRATION_SPECS_22: 1
+ rvm: 2.2.9
+ sudo: true
+ script: sudo -E $(which bundle) exec rake spec:integration;
+ # also remove integration / external tests
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - env:
+ INTEGRATION_SPECS_23: 1
+ rvm: 2.3.6
+ sudo: true
+ script: sudo -E $(which bundle) exec rake spec:integration;
+ # also remove integration / external tests
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - env:
+ INTEGRATION_SPECS_24: 1
+ rvm: 2.4.3
+ sudo: true
+ script: sudo -E $(which bundle) exec rake spec:integration;
+ # also remove integration / external tests
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - env:
+ FUNCTIONAL_SPECS_22: 1
+ rvm: 2.2.9
sudo: true
- script: sudo -E $(which bundle) exec rake spec;
+ script: sudo -E $(which bundle) exec rake spec:functional;
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- - rvm: 2.3.5
+ - env:
+ FUNCTIONAL_SPECS_23: 1
+ rvm: 2.3.6
sudo: true
- script: sudo -E $(which bundle) exec rake spec;
+ script: sudo -E $(which bundle) exec rake spec:functional;
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- - rvm: 2.4.2
+ - env:
+ FUNCTIONAL_SPECS_24: 1
+ rvm: 2.4.3
sudo: true
- script: sudo -E $(which bundle) exec rake spec;
+ script: sudo -E $(which bundle) exec rake spec:functional;
+ # also remove integration / external tests
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - env:
+ UNIT_SPECS_22: 1
+ rvm: 2.2.9
+ sudo: true
+ script:
+ - sudo -E $(which bundle) exec rake spec:unit;
+ - sudo -E $(which bundle) exec rake component_specs
+ # also remove integration / external tests
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - env:
+ UNIT_SPECS_23: 1
+ rvm: 2.3.6
+ sudo: true
+ script:
+ - sudo -E $(which bundle) exec rake spec:unit;
+ - sudo -E $(which bundle) exec rake component_specs
+ # also remove integration / external tests
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - env:
+ UNIT_SPECS_24: 1
+ rvm: 2.4.3
+ sudo: true
+ script:
+ - sudo -E $(which bundle) exec rake spec:unit;
+ - sudo -E $(which bundle) exec rake component_specs
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- env:
CHEFSTYLE: 1
- rvm: 2.3.5
+ rvm: 2.3.6
script: bundle exec rake style
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
@@ -60,11 +118,11 @@ matrix:
- env:
TEST_GEM: chef-provisioning
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.3.5
+ rvm: 2.3.6
- env:
TEST_GEM: cheffish
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.3.5
+ rvm: 2.3.6
- env:
TEST_GEM: chefspec
# The chefspec tests + bundler cache + "gem update --system" interact badly :/
@@ -74,18 +132,18 @@ matrix:
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry
script: tasks/bin/run_external_test $TEST_GEM rake
- rvm: 2.3.5
+ rvm: 2.3.6
- env:
TEST_GEM: knife-windows
script: tasks/bin/run_external_test $TEST_GEM rake unit_spec
- rvm: 2.3.5
+ rvm: 2.3.6
- env:
TEST_GEM: poise
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.3.5
+ rvm: 2.3.6
### START TEST KITCHEN ONLY ###
#
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -103,7 +161,7 @@ matrix:
env:
- UBUNTU=14.04
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -121,7 +179,7 @@ matrix:
env:
- UBUNTU=16.04
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -139,7 +197,7 @@ matrix:
env:
- DEBIAN=7
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -157,7 +215,7 @@ matrix:
env:
- DEBIAN=8
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -175,7 +233,7 @@ matrix:
env:
- DEBIAN=9
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -193,7 +251,7 @@ matrix:
env:
- CENTOS=6
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -211,7 +269,7 @@ matrix:
env:
- CENTOS=7
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -229,7 +287,7 @@ matrix:
env:
- AWESOME_CUSTOMERS_UBUNTU=1
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.3.5
+ - rvm: 2.3.6
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -248,7 +306,7 @@ matrix:
- AWESOME_CUSTOMERS_RHEL=1
- KITCHEN_YAML=.kitchen.travis.yml
### END TEST KITCHEN ONLY ###
- - rvm: 2.3.5
+ - rvm: 2.3.6
sudo: required
dist: trusty
before_install:
@@ -268,12 +326,3 @@ matrix:
- cat /tmp/out.txt
- sudo cat /var/log/squid3/cache.log
- sudo cat /var/log/squid3/access.log
-
-notifications:
- on_change: true
- on_failure: true
- on_success: change
- on_pull_requests: false
- irc:
- channels:
- - chat.freenode.net#chef-hacking
diff --git a/Dockerfile b/Dockerfile
index cf1f1a64dd..6ebc04f7b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@ FROM busybox
MAINTAINER Chef Software, Inc. <docker@chef.io>
ARG CHANNEL=stable
-ARG VERSION=12.19.36
+ARG VERSION=12.21.31
-RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/5/chef-${VERSION}-1.el5.x86_64.rpm" -O /tmp/chef-client.rpm && \
+RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/6/chef-${VERSION}-1.el6.x86_64.rpm" -O /tmp/chef-client.rpm && \
rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \
rm -rf /tmp/chef-client.rpm
diff --git a/spec/functional/mixin/powershell_out_spec.rb b/spec/functional/mixin/powershell_out_spec.rb
index 7fc8dc5957..d6fba5b084 100644
--- a/spec/functional/mixin/powershell_out_spec.rb
+++ b/spec/functional/mixin/powershell_out_spec.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,16 +22,8 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
include Chef::Mixin::PowershellOut
describe "#powershell_out" do
- context "for windows version less than 10", windows_lt_10: true do
- it "runs a powershell command and collects stdout" do
- expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/
- end
- end
-
- context "for windows version greater than 10", windows_gte_10: true do
- it "runs a powershell command and collects stdout" do
- expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+CPU\(s\)\s+Id\s+SI\s+ProcessName\s+/
- end
+ it "runs a powershell command and collects stdout" do
+ expect(powershell_out("get-process").run_command.stdout).to match /Handles/
end
it "does not raise exceptions when the command is invalid" do
@@ -40,16 +32,8 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
end
describe "#powershell_out!" do
- context "for windows version less than 10", windows_lt_10: true do
- it "runs a powershell command and collects stdout" do
- expect(powershell_out!("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/
- end
- end
-
- context "for windows version less than 10", windows_gte_10: true do
- it "runs a powershell command and collects stdout" do
- expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+CPU\(s\)\s+Id\s+SI\s+ProcessName\s+/
- end
+ it "runs a powershell command and collects stdout" do
+ expect(powershell_out!("get-process").run_command.stdout).to match /Handles/
end
it "raises exceptions when the command is invalid" do