Skip to content

Commit cc802d3

Browse files
committed
Merge pull request #320 from garethr/demonstrate-travis-beaker-tests
Demonstrate adding beaker acceptance tests to a module
2 parents da1b42e + e46c1e4 commit cc802d3

File tree

3 files changed

+39
-1
lines changed

3 files changed

+39
-1
lines changed

.travis.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
sudo: false
44
language: ruby
55
cache: bundler
6-
bundler_args: --without system_tests
76
script: "bundle exec rake validate lint spec"
87
matrix:
98
fast_finish: true
@@ -16,5 +15,17 @@ matrix:
1615
env: PUPPET_GEM_VERSION="~> 3.0"
1716
- rvm: 1.9.3
1817
env: PUPPET_GEM_VERSION="~> 3.0"
18+
- rvm: 2.1.6
19+
sudo: required
20+
dist: trusty
21+
services: docker
22+
env: PUPPET_INSTALL_TYPE=agent BEAKER_set="docker/ubuntu-14.04"
23+
script: bundle exec rake beaker
24+
- rvm: 2.1.6
25+
sudo: required
26+
dist: trusty
27+
services: docker
28+
env: PUPPET_INSTALL_TYPE=agent BEAKER_set="docker/centos-7"
29+
script: bundle exec rake beaker
1930
notifications:
2031
email: false
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
HOSTS:
2+
centos-7-x64:
3+
platform: el-7-x86_64
4+
hypervisor : docker
5+
image: centos:7
6+
docker_preserve_image: true
7+
docker_cmd: '["/usr/sbin/init"]'
8+
docker_image_commands:
9+
- 'yum install -y crontabs tar wget openssl'
10+
CONFIG:
11+
log_level: verbose
12+
trace_limit: 200
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
HOSTS:
2+
ubuntu-1404-x64:
3+
platform: ubuntu-14.04-amd64
4+
hypervisor : docker
5+
image: ubuntu:14.04
6+
docker_preserve_image: true
7+
docker_cmd: '["/sbin/init"]'
8+
docker_image_commands:
9+
- 'rm /usr/sbin/policy-rc.d'
10+
- 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
11+
- 'apt-get install -y net-tools wget'
12+
- 'locale-gen en_US.UTF-8'
13+
CONFIG:
14+
log_level: debug
15+
trace_limit: 200

0 commit comments

Comments
 (0)