summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hollinger III <david.hollinger@moduletux.com>2017-06-13 22:13:02 (GMT)
committerGitHub <noreply@github.com>2017-06-13 22:13:02 (GMT)
commit8cfdff1ebeb9ec134edda7c4e06c1a45d7968423 (patch)
treeaaad39011d48f1bc9607ccc520839ab51c16d542
parentfe27464f3ad150c562f6f055506a627ba6ccfa82 (diff)
parent01827a9dc4a4ca3971341512a20b5e84c01cbd87 (diff)
downloadpuppet-prometheus_reporter-8cfdff1ebeb9ec134edda7c4e06c1a45d7968423.zip
puppet-prometheus_reporter-8cfdff1ebeb9ec134edda7c4e06c1a45d7968423.tar.gz
puppet-prometheus_reporter-8cfdff1ebeb9ec134edda7c4e06c1a45d7968423.tar.bz2
Merge pull request #14 from voxpupuli/modulesync
Modulesync 0.21.3
-rw-r--r--.msync.yml2
-rw-r--r--.rspec_parallel1
-rw-r--r--.rubocop.yml8
-rw-r--r--Gemfile1
-rw-r--r--metadata.json2
-rw-r--r--spec/acceptance/nodesets/archlinux-2-x64.yml13
6 files changed, 25 insertions, 2 deletions
diff --git a/.msync.yml b/.msync.yml
index 89e1807..4abde22 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.21.1'
+modulesync_config_version: '0.21.3'
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000..e4d136b
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1 @@
+--format progress
diff --git a/.rubocop.yml b/.rubocop.yml
index 6c9347f..d92e4e4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -503,6 +503,10 @@ Style/ClosingParenthesisIndentation:
# RSpec
+RSpec/BeforeAfterAll:
+ Exclude:
+ - spec/acceptance/**/*
+
# We don't use rspec in this way
RSpec/DescribeClass:
Enabled: False
@@ -522,6 +526,10 @@ RSpec/RepeatedDescription:
RSpec/NestedGroups:
Enabled: False
+# this is broken on ruby1.9
+Style/IndentHeredoc:
+ Enabled: False
+
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Security/YAMLLoad:
Enabled: false
diff --git a/Gemfile b/Gemfile
index d35336c..0914f7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ group :test do
gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2'
+ gem 'parallel_tests', :require => false
end
group :development do
diff --git a/metadata.json b/metadata.json
index 3ed338d..a9d6e98 100644
--- a/metadata.json
+++ b/metadata.json
@@ -40,7 +40,7 @@
"requirements": [
{
"name": "puppet",
- "version_requirement": ">= 4.6.1 < 5.0.0"
+ "version_requirement": ">= 4.7.0 < 5.0.0"
}
],
"dependencies": [
diff --git a/spec/acceptance/nodesets/archlinux-2-x64.yml b/spec/acceptance/nodesets/archlinux-2-x64.yml
new file mode 100644
index 0000000..89b6300
--- /dev/null
+++ b/spec/acceptance/nodesets/archlinux-2-x64.yml
@@ -0,0 +1,13 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+ archlinux-2-x64:
+ roles:
+ - master
+ platform: archlinux-2-x64
+ box: archlinux/archlinux
+ hypervisor: vagrant
+CONFIG:
+ type: foss