Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

Commit e7f44f4

Browse files
bastelfreakbastelfreak
committed
modulesync 0.20.0
1 parent a83c567 commit e7f44f4

19 files changed

+266
-29
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ spec/fixtures/manifests/
77
spec/fixtures/modules/
88
.vagrant/
99
.bundle/
10+
.ruby-version
1011
coverage/
1112
log/
1213
.idea/
14+
.dependencies/
15+
.librarian/
16+
Puppetfile.lock
1317
*.iml
1418
.*.sw?
1519
.yardoc/

‎.msync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '0.16.11'
1+
modulesync_config_version: '0.20.0'

‎.pmtignore

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
docs/
2+
pkg/
3+
Gemfile.lock
4+
Gemfile.local
5+
vendor/
6+
.vendor/
7+
spec/fixtures/manifests/
8+
spec/fixtures/modules/
9+
.vagrant/
10+
.bundle/
11+
.ruby-version
12+
coverage/
13+
log/
14+
.idea/
15+
.dependencies/
16+
.librarian/
17+
Puppetfile.lock
18+
*.iml
19+
.*.sw?
20+
.yardoc/

‎.travis.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
11
---
22
sudo: false
3+
dist: trusty
34
language: ruby
45
cache: bundler
56
bundler_args: --without system_tests development
67
before_install:
78
- bundle -v
89
- rm Gemfile.lock || true
910
- gem update --system
10-
- gem install bundler -v '~>1.13.0'
11+
- gem update bundler
1112
- gem --version
1213
- bundle -v
1314
script:
1415
- 'bundle exec rake $CHECK'
1516
matrix:
1617
fast_finish: true
1718
include:
18-
- rvm: 1.9.3
19-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
20-
- rvm: 1.9.3
21-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
22-
- rvm: 2.1.9
23-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
2419
- rvm: 2.1.9
2520
env: PUPPET_VERSION="~> 4.0" CHECK=test
2621
- rvm: 2.2.6
2722
env: PUPPET_VERSION="~> 4.0" CHECK=test
28-
- rvm: 2.3.3
29-
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
30-
- rvm: 2.3.3
31-
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
3223
- rvm: 2.3.3
3324
env: PUPPET_VERSION="~> 4.0" CHECK=test
3425
- rvm: 2.4.0
3526
env: PUPPET_VERSION="~> 4.0" CHECK=test
36-
allow_failures:
37-
- rvm: 2.4.0
27+
- rvm: 2.4.0
28+
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
29+
- rvm: 2.4.0
30+
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
3831
branches:
3932
only:
4033
- master

‎.yardopts

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
--markup markdown
2+
--output-dir docs/

‎Gemfile

+7-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '~> 1.2.2', :require => false
14+
gem 'puppetlabs_spec_helper', '~> 2.0.1', :require => false
15+
gem 'parallel_tests', :require => false
1516
gem 'rspec-puppet', '~> 2.5', :require => false
1617
gem 'rspec-puppet-facts', :require => false
1718
gem 'rspec-puppet-utils', :require => false
@@ -29,10 +30,12 @@ group :test do
2930
gem 'redcarpet', :require => false
3031
gem 'rubocop', '~> 0.47.0', :require => false if RUBY_VERSION >= '2.3.0'
3132
gem 'rubocop-rspec', '~> 1.10.0', :require => false if RUBY_VERSION >= '2.3.0'
32-
gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0'
3333
gem 'mocha', '>= 1.2.1', :require => false
34-
gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0'
35-
gem 'simplecov-console', :require => false if RUBY_VERSION >= '2.0.0'
34+
gem 'coveralls', :require => false
35+
gem 'simplecov-console', :require => false
36+
gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2'
37+
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
38+
gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2'
3639
end
3740

3841
group :development do

‎Rakefile

+11
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,15 @@ task test: [
3030
:metadata_lint,
3131
:release_checks,
3232
]
33+
34+
begin
35+
require 'github_changelog_generator/task'
36+
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
37+
version = (Blacksmith::Modulefile.new).version
38+
config.future_release = "#{version}"
39+
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module."
40+
config.exclude_labels = %w{duplicate question invalid wontfix modulesync}
41+
end
42+
rescue LoadError
43+
end
3344
# vim: syntax=ruby

‎metadata.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,27 @@
33
{
44
"operatingsystem": "RedHat",
55
"operatingsystemrelease": [
6-
"5",
76
"6",
87
"7"
98
]
109
},
1110
{
1211
"operatingsystem": "CentOS",
1312
"operatingsystemrelease": [
14-
"5",
1513
"6",
1614
"7"
1715
]
1816
},
1917
{
2018
"operatingsystem": "OracleLinux",
2119
"operatingsystemrelease": [
22-
"5",
2320
"6",
2421
"7"
2522
]
2623
},
2724
{
2825
"operatingsystem": "Scientific",
2926
"operatingsystemrelease": [
30-
"5",
3127
"6",
3228
"7"
3329
]
@@ -41,15 +37,13 @@
4137
{
4238
"operatingsystem": "Debian",
4339
"operatingsystemrelease": [
44-
"6",
4540
"7",
4641
"8"
4742
]
4843
},
4944
{
5045
"operatingsystem": "Ubuntu",
5146
"operatingsystemrelease": [
52-
"12.04",
5347
"14.04",
5448
"16.04"
5549
]
@@ -96,12 +90,12 @@
9690
"requirements": [
9791
{
9892
"name": "puppet",
99-
"version_requirement": ">= 3.8.7 < 5.0.0"
93+
"version_requirement": ">= 4.6.1 < 5.0.0"
10094
}
10195
],
10296
"name": "puppet-staging",
10397
"description": "Manages compressed file staging and deployment.",
104-
"version": "2.2.1-rc0",
98+
"version": "3.0.0-rc0",
10599
"author": "Vox Pupuli",
106100
"summary": "Compressed file staging and deployment",
107101
"license": "Apache-2.0",

‎spec/acceptance/nodesets/centos-6-x64.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
HOSTS:
6+
centos-6-x64:
7+
roles:
8+
- master
9+
platform: el-6-x86_64
10+
box: centos/6
11+
hypervisor: vagrant
12+
CONFIG:
13+
type: aio
14+
...
15+
# vim: syntax=yaml

‎spec/acceptance/nodesets/centos-7-x64.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
HOSTS:
6+
centos-7-x64:
7+
roles:
8+
- master
9+
platform: el-7-x86_64
10+
box: centos/7
11+
hypervisor: vagrant
12+
CONFIG:
13+
type: aio
14+
...
15+
# vim: syntax=yaml

‎spec/acceptance/nodesets/docker/centos-7.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ HOSTS:
1010
docker_preserve_image: true
1111
docker_cmd: '["/usr/sbin/init"]'
1212
docker_image_commands:
13-
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which'
13+
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss'
1414
CONFIG:
1515
trace_limit: 200
1616
masterless: true

‎spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
#
6+
# Additional ~/.fog config file with AWS EC2 credentials
7+
# required.
8+
#
9+
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
10+
#
11+
# Amazon Linux is not a RHEL clone.
12+
#
13+
HOSTS:
14+
amazonlinux-2016091-x64:
15+
roles:
16+
- master
17+
platform: centos-6-x86_64
18+
hypervisor: ec2
19+
# refers to image_tempaltes.yaml AMI[vmname] entry:
20+
vmname: amazonlinux-2016091-eu-central-1
21+
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
22+
snapshot: aio
23+
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
24+
amisize: t2.micro
25+
# required so that beaker sanitizes sshd_config and root authorized_keys:
26+
user: ec2-user
27+
CONFIG:
28+
type: aio
29+
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
30+
...
31+
# vim: syntax=yaml

‎spec/acceptance/nodesets/ec2/image_templates.yaml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This file is managed via modulesync
2+
# https://github.com/voxpupuli/modulesync
3+
# https://github.com/voxpupuli/modulesync_config
4+
#
5+
# see also: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
6+
#
7+
# Hint: image IDs (ami-*) for the same image are different per location.
8+
#
9+
AMI:
10+
# Amazon Linux AMI 2016.09.1 (HVM), SSD Volume Type
11+
amazonlinux-2016091-eu-central-1:
12+
:image:
13+
:aio: ami-af0fc0c0
14+
:region: eu-central-1
15+
# Red Hat Enterprise Linux 7.3 (HVM), SSD Volume Type
16+
rhel-73-eu-central-1:
17+
:image:
18+
:aio: ami-e4c63e8b
19+
:region: eu-central-1
20+
# SUSE Linux Enterprise Server 12 SP2 (HVM), SSD Volume Type
21+
sles-12sp2-eu-central-1:
22+
:image:
23+
:aio: ami-c425e4ab
24+
:region: eu-central-1
25+
# Ubuntu Server 16.04 LTS (HVM), SSD Volume Type
26+
ubuntu-1604-eu-central-1:
27+
:image:
28+
:aio: ami-fe408091
29+
:region: eu-central-1
30+
# Microsoft Windows Server 2016 Base
31+
windows-2016-base-eu-central-1:
32+
:image:
33+
:aio: ami-88ec20e7
34+
:region: eu-central-1

‎spec/acceptance/nodesets/ec2/rhel-73-x64.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
#
6+
# Additional ~/.fog config file with AWS EC2 credentials
7+
# required.
8+
#
9+
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
10+
#
11+
HOSTS:
12+
rhel-73-x64:
13+
roles:
14+
- master
15+
platform: el-7-x86_64
16+
hypervisor: ec2
17+
# refers to image_tempaltes.yaml AMI[vmname] entry:
18+
vmname: rhel-73-eu-central-1
19+
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
20+
snapshot: aio
21+
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
22+
amisize: t2.micro
23+
# required so that beaker sanitizes sshd_config and root authorized_keys:
24+
user: ec2-user
25+
CONFIG:
26+
type: aio
27+
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
28+
...
29+
# vim: syntax=yaml

‎spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
#
6+
# Additional ~/.fog config file with AWS EC2 credentials
7+
# required.
8+
#
9+
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
10+
#
11+
HOSTS:
12+
sles-12sp2-x64:
13+
roles:
14+
- master
15+
platform: sles-12-x86_64
16+
hypervisor: ec2
17+
# refers to image_tempaltes.yaml AMI[vmname] entry:
18+
vmname: sles-12sp2-eu-central-1
19+
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
20+
snapshot: aio
21+
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
22+
amisize: t2.micro
23+
# required so that beaker sanitizes sshd_config and root authorized_keys:
24+
user: ec2-user
25+
CONFIG:
26+
type: aio
27+
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
28+
...
29+
# vim: syntax=yaml

‎spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
#
6+
# Additional ~/.fog config file with AWS EC2 credentials
7+
# required.
8+
#
9+
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
10+
#
11+
HOSTS:
12+
ubuntu-1604-x64:
13+
roles:
14+
- master
15+
platform: ubuntu-16.04-amd64
16+
hypervisor: ec2
17+
# refers to image_tempaltes.yaml AMI[vmname] entry:
18+
vmname: ubuntu-1604-eu-central-1
19+
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
20+
snapshot: aio
21+
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
22+
amisize: t2.micro
23+
# required so that beaker sanitizes sshd_config and root authorized_keys:
24+
user: ubuntu
25+
CONFIG:
26+
type: aio
27+
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
28+
...
29+
# vim: syntax=yaml

0 commit comments

Comments
 (0)