Skip to content

Commit 1164efa

Browse files
committed
activate fedora integration tests in travis, remove ubuntu 15.10 from travis
1 parent 51f4f12 commit 1164efa

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

.kitchen.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ platforms:
2121
- name: ubuntu-14.04
2222
driver:
2323
image: ubuntu:14.04
24-
- name: ubuntu-15.10
25-
driver:
26-
image: ubuntu:15.10
27-
pid_one_command: /bin/systemd
2824
- name: ubuntu-16.04
2925
driver:
3026
image: ubuntu:16.04
@@ -66,6 +62,19 @@ platforms:
6662
- RUN /usr/bin/apt-get update
6763
- RUN /usr/bin/apt-get install -y procps
6864
pid_one_command: /bin/systemd
65+
- name: fedora-23
66+
driver:
67+
image: fedora:23
68+
pid_one_command: /usr/lib/systemd/systemd
69+
# Chef needs yum package for now: https://github.com/chef/chef/issues/3201
70+
intermediate_instructions:
71+
- RUN dnf install -y yum
72+
- name: fedora-24
73+
driver:
74+
image: fedora:24
75+
pid_one_command: /usr/lib/systemd/systemd
76+
intermediate_instructions:
77+
- RUN dnf install -y yum
6978

7079
suites:
7180
- name: default

.travis.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,21 @@ matrix:
2020
# integration tests
2121
- rvm: 2.3.1
2222
bundler_args: "--without guard tools"
23-
script: bundle exec rake test:integration OS='centos oracle'
24-
gemfile: Gemfile
23+
script: bundle exec rake $SUITE
24+
env: SUITE=test:integration OS='centos'
2525
- rvm: 2.3.1
2626
bundler_args: "--without guard tools"
27-
script: bundle exec rake test:integration OS='ubuntu debian'
28-
gemfile: Gemfile
27+
script: bundle exec rake $SUITE
28+
env: SUITE=test:integration OS='oracle'
29+
- rvm: 2.3.1
30+
bundler_args: "--without guard tools"
31+
script: bundle exec rake $SUITE
32+
env: SUITE=test:integration OS='ubuntu'
33+
- rvm: 2.3.1
34+
bundler_args: "--without guard tools"
35+
script: bundle exec rake $SUITE
36+
env: SUITE=test:integration OS='debian'
37+
- rvm: 2.3.1
38+
bundler_args: "--without guard tools"
39+
script: bundle exec rake $SUITE
40+
env: SUITE=test:integration OS='fedora'

0 commit comments

Comments
 (0)