Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ platforms:
- name: ubuntu-14.04
driver:
image: ubuntu:14.04
- name: ubuntu-15.10
driver:
image: ubuntu:15.10
pid_one_command: /bin/systemd
- name: ubuntu-16.04
driver:
image: ubuntu:16.04
Expand Down Expand Up @@ -66,6 +62,19 @@ platforms:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install -y procps
pid_one_command: /bin/systemd
- name: fedora-23
driver:
image: fedora:23
pid_one_command: /usr/lib/systemd/systemd
# Chef needs yum package for now: https://github.com/chef/chef/issues/3201
intermediate_instructions:
- RUN dnf install -y yum
- name: fedora-24
driver:
image: fedora:24
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN dnf install -y yum

suites:
- name: default
Expand Down
20 changes: 16 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,21 @@ matrix:
# integration tests
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake test:integration OS='centos oracle'
gemfile: Gemfile
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='centos'
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake test:integration OS='ubuntu debian'
gemfile: Gemfile
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='oracle'
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='ubuntu'
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='debian'
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='fedora'