Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #842 from tphoney/remove_unsupported_code
[puppet-modules/puppetlabs-apt.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index e0df4ea5c93aea0cbbb673b3982ce1479b99f0bb..88c55fd2241ec17692ed6d47b1cbd2659be95b96 100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-1,38
+1,37
@@
---
---
-sudo: false
dist: trusty
language: ruby
cache: bundler
before_install:
- bundle -v
- rm -f Gemfile.lock
dist: trusty
language: ruby
cache: bundler
before_install:
- bundle -v
- rm -f Gemfile.lock
- - gem update --system
+ - gem update --system
$RUBYGEMS_VERSION
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- gem --version
- bundle -v
script:
- 'bundle exec rake $CHECK'
bundler_args: --without system_tests
rvm:
- - 2.
4.4
+ - 2.
5.1
env:
global:
env:
global:
- - BEAKER_PUPPET_COLLECTION=puppet
5 PUPPET_GEM_VERSION="~> 5
.0"
+ - BEAKER_PUPPET_COLLECTION=puppet
6 PUPPET_GEM_VERSION="~> 6
.0"
matrix:
fast_finish: true
include:
-
bundler_args:
dist: trusty
matrix:
fast_finish: true
include:
-
bundler_args:
dist: trusty
- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet
5
BEAKER_set=docker/debian-8 BEAKER_TESTMODE=apply
- rvm: 2.
4.4
+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet
6
BEAKER_set=docker/debian-8 BEAKER_TESTMODE=apply
+ rvm: 2.
5.1
script: bundle exec rake beaker
services: docker
sudo: required
-
bundler_args:
dist: trusty
script: bundle exec rake beaker
services: docker
sudo: required
-
bundler_args:
dist: trusty
- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet
5
BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
- rvm: 2.
4.4
+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet
6
BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+ rvm: 2.
5.1
script: bundle exec rake beaker
services: docker
sudo: required
script: bundle exec rake beaker
services: docker
sudo: required
@@
-41,8
+40,8
@@
matrix:
-
env: CHECK=parallel_spec
-
-
env: CHECK=parallel_spec
-
- env: PUPPET_GEM_VERSION="~>
4
.0" CHECK=parallel_spec
- rvm: 2.
1.9
+ env: PUPPET_GEM_VERSION="~>
5
.0" CHECK=parallel_spec
+ rvm: 2.
4.4
branches:
only:
- master
branches:
only:
- master