Skip to content

Commit 8af39ce

Browse files
bastelfreakbastelfreak
committed
modulesync 2.4.1
1 parent 8ba9aef commit 8af39ce

File tree

4 files changed

+31
-68
lines changed

4 files changed

+31
-68
lines changed

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.3.1'
1+
modulesync_config_version: '2.4.0'

‎.travis.yml‎

Lines changed: 21 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
sudo: false
3-
dist: trusty
3+
dist: xenial
44
language: ruby
55
cache: bundler
66
before_install:
@@ -10,9 +10,6 @@ script:
1010
matrix:
1111
fast_finish: true
1212
include:
13-
- rvm: 2.1.9
14-
bundler_args: --without system_tests development release
15-
env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
1613
- rvm: 2.4.4
1714
bundler_args: --without system_tests development release
1815
env: PUPPET_VERSION="~> 5.0" CHECK=test
@@ -27,128 +24,102 @@ matrix:
2724
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
2825
- rvm: 2.5.1
2926
bundler_args: --without development release
30-
dist: trusty
31-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
32-
services: docker
33-
sudo: required
34-
- rvm: 2.5.1
35-
bundler_args: --without development release
36-
dist: trusty
37-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
27+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1804-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
3828
services: docker
3929
sudo: required
4030
- rvm: 2.5.1
4131
bundler_args: --without development release
42-
dist: trusty
43-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
32+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1804-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
4433
services: docker
4534
sudo: required
4635
- rvm: 2.5.1
4736
bundler_args: --without development release
48-
dist: trusty
49-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
37+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1804-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
5038
services: docker
5139
sudo: required
5240
- rvm: 2.5.1
5341
bundler_args: --without development release
54-
dist: trusty
55-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
42+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
5643
services: docker
5744
sudo: required
5845
- rvm: 2.5.1
5946
bundler_args: --without development release
60-
dist: trusty
61-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
47+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
6248
services: docker
6349
sudo: required
6450
- rvm: 2.5.1
6551
bundler_args: --without development release
66-
dist: trusty
67-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
52+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
6853
services: docker
6954
sudo: required
7055
- rvm: 2.5.1
7156
bundler_args: --without development release
72-
dist: trusty
73-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
57+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
7458
services: docker
7559
sudo: required
7660
- rvm: 2.5.1
7761
bundler_args: --without development release
78-
dist: trusty
79-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
62+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
8063
services: docker
8164
sudo: required
8265
- rvm: 2.5.1
8366
bundler_args: --without development release
84-
dist: trusty
85-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
67+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1404-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-ubuntu1604-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
8668
services: docker
8769
sudo: required
8870
- rvm: 2.5.1
8971
bundler_args: --without development release
90-
dist: trusty
91-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
72+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
9273
services: docker
9374
sudo: required
9475
- rvm: 2.5.1
9576
bundler_args: --without development release
96-
dist: trusty
97-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
77+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
9878
services: docker
9979
sudo: required
10080
- rvm: 2.5.1
10181
bundler_args: --without development release
102-
dist: trusty
103-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker
82+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
10483
services: docker
10584
sudo: required
10685
- rvm: 2.5.1
10786
bundler_args: --without development release
108-
dist: trusty
109-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker
87+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
11088
services: docker
11189
sudo: required
11290
- rvm: 2.5.1
11391
bundler_args: --without development release
114-
dist: trusty
115-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker
92+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos6-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-centos7-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
11693
services: docker
11794
sudo: required
11895
- rvm: 2.5.1
11996
bundler_args: --without development release
120-
dist: trusty
121-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
97+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian9-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
12298
services: docker
12399
sudo: required
124100
- rvm: 2.5.1
125101
bundler_args: --without development release
126-
dist: trusty
127-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
102+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian9-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
128103
services: docker
129104
sudo: required
130105
- rvm: 2.5.1
131106
bundler_args: --without development release
132-
dist: trusty
133-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
107+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian9-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian9-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
134108
services: docker
135109
sudo: required
136110
- rvm: 2.5.1
137111
bundler_args: --without development release
138-
dist: trusty
139-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
112+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian8-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
140113
services: docker
141114
sudo: required
142115
- rvm: 2.5.1
143116
bundler_args: --without development release
144-
dist: trusty
145-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
117+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian8-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
146118
services: docker
147119
sudo: required
148120
- rvm: 2.5.1
149121
bundler_args: --without development release
150-
dist: trusty
151-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
122+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian8-64vpnserver.ma{hypervisor=docker\,hostname=vpnserver}-debian8-64vpnclienta.a{hypervisor=docker\,hostname=vpnclienta} BEAKER_HYPERVISOR=docker CHECK=beaker
152123
services: docker
153124
sudo: required
154125
branches:

‎spec/default_facts.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎spec/spec_helper.rb‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
require 'rspec-puppet-facts'
1010
include RspecPuppetFacts
1111

12+
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
13+
facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
14+
if facts
15+
facts.each do |name, value|
16+
add_custom_fact name.to_sym, value
17+
end
18+
end
19+
end
20+
1221
if Dir.exist?(File.expand_path('../../lib', __FILE__))
1322
require 'coveralls'
1423
require 'simplecov'
@@ -26,10 +35,6 @@
2635
end
2736

2837
RSpec.configure do |c|
29-
default_facts = {}
30-
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
31-
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
32-
c.default_facts = default_facts
3338
c.hiera_config = 'spec/fixtures/hiera/hiera.yaml'
3439

3540
# Coverage generation

0 commit comments

Comments
 (0)