Skip to content

CI improvements #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 17, 2016
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
19 changes: 17 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,24 @@ matrix:
- rvm: 2.1
- rvm: 2.0
- rvm: 2.2
script: bundle exec rake test test:docker config=test-travis-1.yaml
script: bundle exec rake $SUITE
env: SUITE="test"
- rvm: 2.2
script: bundle exec rake test:docker config=test-travis-2.yaml
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-debian.yml"
- rvm: 2.2
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-centos.yml"
- rvm: 2.2
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-oel.yml"
- rvm: 2.2
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-fedora.yml"
- rvm: 2.2
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-ubuntu.yml"

deploy:
provider: rubygems
gemspec: train.gemspec
Expand Down
5 changes: 4 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
version: "master-{build}"

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

platform:
- x64

Expand Down
13 changes: 0 additions & 13 deletions test/integration/test-travis-1.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions test/integration/test-travis-2.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions test/integration/test-travis-centos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
images:
- centos:5.11
- centos:6.8
- centos:7.2.1511
provision:
- script: bootstrap.sh
6 changes: 6 additions & 0 deletions test/integration/test-travis-debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
images:
- debian:6.0.10
- debian:7.11
- debian:8.5
provision:
- script: bootstrap.sh
8 changes: 8 additions & 0 deletions test/integration/test-travis-fedora.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
images:
- fedora:20
- fedora:21
- fedora:22
- fedora:23
- fedora:24
provision:
- script: bootstrap.sh
6 changes: 6 additions & 0 deletions test/integration/test-travis-oel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
images:
- oraclelinux:5.11
- oraclelinux:6.8
- oraclelinux:7.2
provision:
- script: bootstrap.sh
8 changes: 8 additions & 0 deletions test/integration/test-travis-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
images:
- ubuntu:10.04
- ubuntu:12.04
- ubuntu:14.04
- ubuntu:16.04
- ubuntu:16.10
provision:
- script: bootstrap.sh
2 changes: 1 addition & 1 deletion test/windows/winrm_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
require 'mocha/setup'
require 'train'

describe 'windows local command' do
describe 'windows winrm command' do
let(:conn) {
# get final config
target_config = Train.target_config({
Expand Down