Skip to content

Commit 42f4432

Browse files
authored
Merge pull request #158 from ekohl/docker-sets-light
Use docker_sets in travis.yml
2 parents 811f2a0 + 5c45da9 commit 42f4432

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.sync.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
22
.travis.yml:
3-
extras:
4-
- rvm: 2.4.0
5-
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_set="docker/centos-7" bundle exec rake acceptance
6-
services: docker
7-
sudo: required
8-
bundler_args: --without development
3+
docker_sets:
4+
- set: docker/centos-7
95
secure: "l2HEhssQyDQGrdBkGS8f/gQ4FA5vVLM0JegyAVaaIXpRrJYgRiDAvC+u81HS//+J0v9cr4jo74ncl1HGU0QJZURJX/L8DJqUVXzSZpe9HmfrQpV1RDUSNMqzaIq5Z268Ou9n1Jkeg58WJyIaks9PQhXoWRRSnaCyDHrbGM8XcAU="

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ matrix:
2525
- rvm: 2.4.3
2626
bundler_args: --without system_tests development release
2727
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
28-
- rvm: 2.4.0
29-
bundler_args: --without development
30-
env: PUPPET_VERSION="~> 4.0" CHECK=acceptance BEAKER_set="docker/centos-7" bundle exec rake acceptance
28+
- rvm: 2.4.3
29+
bundler_args: --without development release
30+
dist: trusty
31+
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
3132
services: docker
3233
sudo: required
3334
branches:

0 commit comments

Comments
 (0)