Skip to content

Commit

Permalink
- updating vendored docker-api gem to 1.26.0
Browse files Browse the repository at this point in the history
- setting default installation version to 1.9.1
- updating inspec for service-systemd
- updating inspec for service-upstart
- removing unused serverspec suites
  • Loading branch information
Sean OMeara committed Feb 10, 2016
1 parent d58d6f8 commit 5dfaca7
Show file tree
Hide file tree
Showing 72 changed files with 140 additions and 5,369 deletions.
164 changes: 90 additions & 74 deletions .kitchen.cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,33 +120,43 @@ suites:
# docker_installation_binary resource
#####################################

- name: installation_binary-171
includes: [
'ubuntu-15.10'
]
attributes:
docker:
version: '1.7.1'
run_list:
- recipe[docker_test::installation_binary]
# - name: installation_binary-171
# includes: [
# 'ubuntu-15.10'
# ]
# attributes:
# docker:
# version: '1.7.1'
# run_list:
# - recipe[docker_test::installation_binary]

- name: installation_binary-183
includes: [
'ubuntu-15.10'
]
attributes:
docker:
version: '1.8.3'
run_list:
- recipe[docker_test::installation_binary]
# - name: installation_binary-183
# includes: [
# 'ubuntu-15.10'
# ]
# attributes:
# docker:
# version: '1.8.3'
# run_list:
# - recipe[docker_test::installation_binary]

- name: installation_binary-190
# - name: installation_binary-191
# includes: [
# 'ubuntu-15.10'
# ]
# attributes:
# docker:
# version: '1.9.1'
# run_list:
# - recipe[docker_test::installation_binary]

- name: installation_binary-1100
includes: [
'ubuntu-15.10'
]
attributes:
docker:
version: '1.9.0'
version: '1.10.0'
run_list:
- recipe[docker_test::installation_binary]

Expand Down Expand Up @@ -188,20 +198,35 @@ suites:
# docker_installation_package resource
######################################

- name: installation_package-171
includes: [
'centos-6.5',
'ubuntu-12.04',
'ubuntu-14.04',
'ubuntu-15.10'
]
attributes:
docker:
version: '1.7.1'
run_list:
- recipe[docker_test::installation_package]
# - name: installation_package-171
# includes: [
# 'centos-6.5',
# 'ubuntu-12.04',
# 'ubuntu-14.04',
# 'ubuntu-15.10'
# ]
# attributes:
# docker:
# version: '1.7.1'
# run_list:
# - recipe[docker_test::installation_package]

# - name: installation_package-183
# includes: [
# 'centos-7.0',
# 'debian-8.1',
# 'fedora-21',
# 'ubuntu-12.04',
# 'ubuntu-14.04',
# 'ubuntu-15.10'
# ]
# attributes:
# docker:
# version: '1.8.3'
# run_list:
# - recipe[docker_test::installation_package]

- name: installation_package-183
- name: installation_package-191
includes: [
'centos-7.0',
'debian-8.1',
Expand All @@ -212,22 +237,21 @@ suites:
]
attributes:
docker:
version: '1.8.3'
version: '1.9.1'
run_list:
- recipe[docker_test::installation_package]

- name: installation_package-190
- name: installation_package-1100
includes: [
'centos-7.0',
'debian-8.1',
'fedora-21',
'ubuntu-12.04',
'ubuntu-14.04',
'ubuntu-15.10'
]
attributes:
docker:
version: '1.9.0'
version: '1.10.0'
run_list:
- recipe[docker_test::installation_package]

Expand All @@ -236,23 +260,13 @@ suites:
#################################
- name: service-execute
includes: [
'centos-7.0',
'fedora-21',
'debian-8.1',
'ubuntu-12.04',
'ubuntu-14.04',
'ubuntu-15.10',
]
run_list:
- recipe[docker_test::service_execute]

- name: service-execute-multi
includes: [
'centos-7.0',
'fedora-21',
'debian-8.1',
'ubuntu-12.04',
'ubuntu-14.04',
'ubuntu-15.10',
]
run_list:
Expand Down Expand Up @@ -321,38 +335,50 @@ suites:
# bulk resource testing
#######################

- name: resources-171
includes: [
'ubuntu-15.10',
]
attributes:
docker:
version: '1.7.1'
service_manager: system
run_list:
- recipe[docker_test::default]
- recipe[docker_test::image]
- recipe[docker_test::container]
# - name: resources-171
# includes: [
# 'ubuntu-15.10',
# ]
# attributes:
# docker:
# version: '1.7.1'
# service_manager: system
# run_list:
# - recipe[docker_test::default]
# - recipe[docker_test::image]
# - recipe[docker_test::container]

# - name: resources-183
# includes: [
# 'ubuntu-15.10'
# ]
# attributes:
# docker:
# version: '1.8.3'
# run_list:
# - recipe[docker_test::default]
# - recipe[docker_test::image]
# - recipe[docker_test::container]

- name: resources-183
- name: resources-191
includes: [
'ubuntu-15.10'
]
attributes:
docker:
version: '1.8.3'
version: '1.9.1'
run_list:
- recipe[docker_test::default]
- recipe[docker_test::image]
- recipe[docker_test::container]

- name: resources-191
- name: resources-1100
includes: [
'ubuntu-15.10'
]
attributes:
docker:
version: '1.9.1'
version: '1.10.0'
run_list:
- recipe[docker_test::default]
- recipe[docker_test::image]
Expand All @@ -364,7 +390,7 @@ suites:
]
attributes:
docker:
version: '1.9.1'
version: '1.10.0'
run_list:
- recipe[docker_test::default]
- recipe[docker_test::network]
Expand All @@ -389,16 +415,6 @@ suites:
# misc test cases
#################

- name: notifications
includes: [
'ubuntu-15.10'
]
attributes:
docker:
version: '1.8.3'
run_list:
- recipe[docker_test::notifications]

# - name: timeout
# includes: [
# 'ubuntu-15.10'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ group :unit do
end

group :kitchen_common do
gem 'test-kitchen', '~> 1.5'
gem 'test-kitchen', '~> 1.4.2'
gem 'kitchen-sync'
gem 'kitchen-inspec'
end
Expand Down
Binary file removed files/default/vendor/cache/docker-api-1.25.0.gem
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/opt/chefdk/embedded/bin/ruby -r ./siteconf20151204-14925-ka330a.rb extconf.rb
/opt/chefdk/embedded/bin/ruby -r ./siteconf20160210-96467-1xjgyxv.rb extconf.rb
creating Makefile

make "DESTDIR=" clean
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions files/default/vendor/gems/docker-api-1.25.0/.cane

This file was deleted.

6 changes: 0 additions & 6 deletions files/default/vendor/gems/docker-api-1.25.0/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion files/default/vendor/gems/docker-api-1.25.0/.rspec

This file was deleted.

4 changes: 0 additions & 4 deletions files/default/vendor/gems/docker-api-1.25.0/.simplecov

This file was deleted.

18 changes: 0 additions & 18 deletions files/default/vendor/gems/docker-api-1.25.0/.travis.yml

This file was deleted.

2 changes: 0 additions & 2 deletions files/default/vendor/gems/docker-api-1.25.0/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions files/default/vendor/gems/docker-api-1.25.0/Gemfile

This file was deleted.

22 changes: 0 additions & 22 deletions files/default/vendor/gems/docker-api-1.25.0/LICENSE

This file was deleted.

Loading

0 comments on commit 5dfaca7

Please sign in to comment.