Skip to content

Commit

Permalink
edits to kitchen and travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Sean OMeara committed Oct 28, 2015
1 parent 239cf77 commit 1ada2e5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
23 changes: 7 additions & 16 deletions .kitchen.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,24 @@ settings:

driver:
name: docker
# privileged is required otherwise the container doesn't boot right
privileged: true

platforms:
- name: centos-5.8
- name: centos-5
driver:
image: centos:5
platform: rhel
run_command: /sbin/init
provision_command:
- /usr/bin/yum install -y initscripts net-tools wget

- name: centos-6.5
- name: centos-6
driver:
image: centos:6
platform: rhel
run_command: /sbin/init
provision_command:
- /usr/bin/yum install -y initscripts net-tools wget

- name: centos-7.1
- name: centos-7
driver:
image: centos:7
platform: rhel
run_command: /usr/lib/systemd/systemd
provision_command:
- /bin/yum install -y initscripts net-tools wget

- name: fedora-22
driver:
image: fedora:22

suites:
- name: default
Expand Down
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ services: docker

env:
matrix:
- INSTANCE=default-centos-58
- INSTANCE=default-centos-65
- INSTANCE=default-centos-71
- INSTANCE=default-centos-5
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=default-fedora-22

# Don't `bundle install`
install: echo "skip bundle install"
Expand Down

0 comments on commit 1ada2e5

Please sign in to comment.