Skip to content

Commit 98d4a8a

Browse files
committed
Remove docker integration tests task
1 parent 2a35077 commit 98d4a8a

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ matrix:
1919
- rvm: 2.2
2020
env: CHEF_VERSION="~> 11.0"
2121

22-
bundler_args: --without doc integration integration_docker integration_vagrant integration_cloud guard
22+
bundler_args: --without doc integration integration_vagrant integration_cloud guard
2323

2424
script:
2525
- travis_retry bundle exec rake style unit

Gemfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ group :integration do
3535
gem 'test-kitchen', '~> 1.4'
3636
end
3737

38-
group :integration_docker do
39-
gem 'kitchen-docker', '~> 2.1'
40-
end
41-
4238
group :integration_vagrant do
4339
gem 'vagrant-wrapper', '~> 2.0'
4440
gem 'kitchen-vagrant', '~> 0.10'

Rakefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# rake doc # Generate Ruby documentation
1212
# rake integration # Run Test Kitchen integration tests
1313
# rake integration:cloud # Run Test Kitchen tests in the cloud
14-
# rake integration:docker # Run Test Kitchen tests using docker
1514
# rake integration:vagrant # Run Test Kitchen tests using vagrant
1615
# rake style # Run all style checks
1716
# rake style:chef # Run Chef style checks using foodcritic
@@ -101,19 +100,14 @@ namespace :integration do
101100
run_kitchen
102101
end
103102

104-
desc 'Run Test Kitchen integration tests using docker'
105-
task :docker do
106-
run_kitchen(local_config: '.kitchen.docker.yml')
107-
end
108-
109103
desc 'Run Test Kitchen integration tests in the cloud'
110104
task :cloud do
111105
run_kitchen(local_config: '.kitchen.cloud.yml')
112106
end
113107
end
114108

115109
desc 'Run Test Kitchen integration tests'
116-
task integration: travis? ? %w(integration:docker) : %w(integration:vagrant)
110+
task integration: %w(integration:vagrant)
117111

118112
desc 'Run doc, style, unit and integration tests'
119113
task default: %w(doc style unit integration)

0 commit comments

Comments
 (0)