Skip to content

Commit 7dbac94

Browse files
author
Bram Vogelaar
committed
Update from attachmentgenie modulesync_configs
1 parent 752982e commit 7dbac94

File tree

5 files changed

+45
-20
lines changed

5 files changed

+45
-20
lines changed

.kitchen.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
driver:
3+
name: vagrant
4+
provisioner:
5+
name: puppet_apply
6+
require_chef_for_busser: false
7+
manifests_path: examples
8+
verifier:
9+
name: inspec
10+
platforms:
11+
- name: ubuntu-12.04
12+
- name: ubuntu-14.04
13+
provisioner:
14+
puppet_apt_repo: https://apt.puppetlabs.com/puppetlabs-release-trusty.deb
15+
- name: ubuntu-16.04
16+
driver_config:
17+
box: geerlingguy/ubuntu1604
18+
provisioner:
19+
puppet_apt_repo: https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb
20+
- name: debian-7.10
21+
provisioner:
22+
puppet_apt_repo: https://apt.puppetlabs.com/puppetlabs-release-jessie.deb
23+
- name: debian-8.5
24+
provisioner:
25+
puppet_apt_repo: https://apt.puppetlabs.com/puppetlabs-release-wheezy.deb
26+
suites:
27+
- name: default
28+
provisioner:
29+
manifest: init.pp

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
sudo: false
33
language: ruby
44
before_install:
5-
- echo "yes" | gem install json
5+
- echo "yes" | gem install json -v 1.8.3
66
bundler_args: --without development system_tests
77
script: "bundle exec rake validate lint spec SPEC_OPTS='--color --format documentation'"
88
matrix:

Gemfile

+12-16
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,26 @@ end
1313
group :test do
1414
gem 'rspec-core', :require => false
1515
gem 'puppetlabs_spec_helper', :require => false
16+
gem 'puppet-strings', :require => false
1617
gem 'simplecov', :require => false
1718
gem 'puppet_facts', :require => false
1819
gem 'metadata-json-lint', :require => false
1920
end
2021

2122
group :development do
22-
gem 'travis', :require => false
23-
gem 'travis-lint', :require => false
24-
gem 'guard-rake', :require => false
25-
gem 'puppet-strings', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs-strings.git'
26-
gem 'redcarpet', :require => false
23+
gem 'travis', :require => false
24+
gem 'travis-lint', :require => false
25+
gem 'guard-rake', :require => false
26+
gem 'redcarpet', :require => false
2727
end
2828

29-
group :system_tests do
30-
gem 'beaker', :require => false
31-
if beaker_version = ENV['BEAKER_VERSION']
32-
gem 'beaker', *location_for(beaker_version)
33-
end
34-
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
35-
gem 'beaker-rspec', *location_for(beaker_rspec_version)
36-
else
37-
gem 'beaker-rspec', :require => false
38-
end
39-
gem 'beaker-puppet_install_helper', :require => false
29+
group :integration do
30+
gem 'test-kitchen', '~> 1.4', :require => false
31+
gem 'kitchen-vagrant', :require => false
32+
gem 'kitchen-puppet', :require => false
33+
gem 'librarian-puppet', :require => false
34+
gem 'kitchen-inspec', :require => false
35+
gem 'concurrent-ruby', '~> 0.9', :require => false
4036
end
4137

4238

Puppetfile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
forge "https://forgeapi.puppetlabs.com"
2+
metadata

Rakefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
require 'puppetlabs_spec_helper/rake_tasks'
22
require 'puppet-lint/tasks/puppet-lint'
3-
if File.exist?('puppet-strings/rake_tasks')
4-
require 'puppet-strings/rake_tasks'
5-
end
3+
require 'puppet-strings/rake_tasks'
64

75
PuppetLint.configuration.fail_on_warnings = true
86
PuppetLint.configuration.send('relative')

0 commit comments

Comments
 (0)