Skip to content

Commit e1da796

Browse files
authored
Merge pull request #133 from chef/chris-rock/ci-tests
CI improvements
2 parents 1a38adc + 56d6bf6 commit e1da796

10 files changed

+56
-30
lines changed

.travis.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,24 @@ matrix:
2323
- rvm: 2.1
2424
- rvm: 2.0
2525
- rvm: 2.2
26-
script: bundle exec rake test test:docker config=test-travis-1.yaml
26+
script: bundle exec rake $SUITE
27+
env: SUITE="test"
2728
- rvm: 2.2
28-
script: bundle exec rake test:docker config=test-travis-2.yaml
29+
script: bundle exec rake $SUITE
30+
env: SUITE="test:docker config=test-travis-debian.yml"
31+
- rvm: 2.2
32+
script: bundle exec rake $SUITE
33+
env: SUITE="test:docker config=test-travis-centos.yml"
34+
- rvm: 2.2
35+
script: bundle exec rake $SUITE
36+
env: SUITE="test:docker config=test-travis-oel.yml"
37+
- rvm: 2.2
38+
script: bundle exec rake $SUITE
39+
env: SUITE="test:docker config=test-travis-fedora.yml"
40+
- rvm: 2.2
41+
script: bundle exec rake $SUITE
42+
env: SUITE="test:docker config=test-travis-ubuntu.yml"
43+
2944
deploy:
3045
provider: rubygems
3146
gemspec: train.gemspec

appveyor.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
version: "master-{build}"
22

3-
os: Windows Server 2012 R2
3+
# fix for retrieving progress information for local execution
4+
# see: http://help.appveyor.com/discussions/problems/5170-progresspreference-not-works-always-shown-preparing-modules-for-first-use-in-stderr
5+
image: Previous Visual Studio 2015
6+
47
platform:
58
- x64
69

test/integration/test-travis-1.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

test/integration/test-travis-2.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
images:
2+
- centos:5.11
3+
- centos:6.8
4+
- centos:7.2.1511
5+
provision:
6+
- script: bootstrap.sh
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
images:
2+
- debian:6.0.10
3+
- debian:7.11
4+
- debian:8.5
5+
provision:
6+
- script: bootstrap.sh
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
images:
2+
- fedora:20
3+
- fedora:21
4+
- fedora:22
5+
- fedora:23
6+
- fedora:24
7+
provision:
8+
- script: bootstrap.sh

test/integration/test-travis-oel.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
images:
2+
- oraclelinux:5.11
3+
- oraclelinux:6.8
4+
- oraclelinux:7.2
5+
provision:
6+
- script: bootstrap.sh
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
images:
2+
- ubuntu:10.04
3+
- ubuntu:12.04
4+
- ubuntu:14.04
5+
- ubuntu:16.04
6+
- ubuntu:16.10
7+
provision:
8+
- script: bootstrap.sh

test/windows/winrm_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
require 'mocha/setup'
88
require 'train'
99

10-
describe 'windows local command' do
10+
describe 'windows winrm command' do
1111
let(:conn) {
1212
# get final config
1313
target_config = Train.target_config({

0 commit comments

Comments
 (0)