diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-12-20 22:28:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 22:28:31 -0800 |
| commit | 9fef8aa25d54ea158eca97dfbcae1207adc635a8 (patch) | |
| tree | 87e18bf2420b18509808564c1bf44ab0017c4778 | |
| parent | 4055d3b8e39a8f8e8a75619e0acba814e8aa50b1 (diff) | |
| parent | 7eb0ca17f8fb6c1d2242e78e135807a6e1cc5fb9 (diff) | |
| download | chef-9fef8aa25d54ea158eca97dfbcae1207adc635a8.tar.gz | |
Merge pull request #5667 from chef/lcg/remove-chef-provisioning
remove chef-provisioning-aws from travis
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 25 |
3 files changed, 7 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 065e03bc07..0ebfa995e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,10 +65,6 @@ matrix: script: tasks/bin/run_external_test $TEST_GEM rake spec rvm: 2.3.1 - env: - TEST_GEM: chef-provisioning-aws - script: tasks/bin/run_external_test $TEST_GEM rake spec - rvm: 2.3.1 - - env: TEST_GEM: chef-sugar script: tasks/bin/run_external_test $TEST_GEM rake rvm: 2.3.1 @@ -32,7 +32,6 @@ end # These are used for external tests group(:integration) do gem "chef-provisioning" - gem "chef-provisioning-aws" gem "chef-sugar" gem "chefspec" gem "halite" diff --git a/Gemfile.lock b/Gemfile.lock index 6bfcbdfb3d..cb73fe8329 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,16 +139,13 @@ GEM mixlib-cli (~> 1.4) artifactory (2.5.1) ast (2.3.0) - aws-sdk (2.6.35) - aws-sdk-resources (= 2.6.35) - aws-sdk-core (2.6.35) + aws-sdk (2.6.40) + aws-sdk-resources (= 2.6.40) + aws-sdk-core (2.6.40) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.35) - aws-sdk-core (= 2.6.35) - aws-sdk-v1 (1.66.0) - json (~> 1.4) - nokogiri (>= 1.4.4) + aws-sdk-resources (2.6.40) + aws-sdk-core (= 2.6.40) aws-sigv4 (1.0.0) backports (3.6.8) binding_of_caller (0.7.2) @@ -166,12 +163,6 @@ GEM net-ssh (>= 2.9, < 4.0) net-ssh-gateway (~> 1.2.0) winrm-fs (~> 1.0) - chef-provisioning-aws (2.1.0) - aws-sdk (>= 2.1.26, < 3.0) - aws-sdk-v1 (>= 1.59.0) - chef-provisioning (>= 1.0, < 3.0) - retryable (~> 2.0, >= 2.0.1) - ubuntu_ami (~> 0.4, >= 0.4.1) chef-sugar (3.4.0) chef-zero (5.1.1) ffi-yajl (~> 2.2) @@ -268,7 +259,7 @@ GEM iniparse (1.4.2) ipaddress (0.8.3) jmespath (1.3.1) - json (1.8.3) + json (2.0.2) kitchen-docker (2.6.0) test-kitchen (>= 1.0.0) kitchen-ec2 (1.2.0) @@ -507,7 +498,6 @@ GEM ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - ubuntu_ami (0.4.1) unf (0.1.4) unf_ext unf_ext (0.0.7.2) @@ -537,7 +527,7 @@ GEM ffi-win32-extensions windows-api (0.4.4) win32-api (>= 1.4.5) - winrm (2.1.0) + winrm (2.1.1) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -571,7 +561,6 @@ DEPENDENCIES chef! chef-config! chef-provisioning - chef-provisioning-aws chef-sugar cheffish chefspec |