From 448a53be0974c91130804579d16b57e3c2440016 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Sun, 11 Jun 2017 17:59:26 +0200
Subject: [PATCH] modulesync 0.21.3

---
 .gitignore                                       |  1 +
 .msync.yml                                       |  2 +-
 .rspec_parallel                                  |  1 +
 .rubocop.yml                                     |  9 +++++++++
 Gemfile                                          |  1 +
 spec/acceptance/nodesets/archlinux-2-x64.yml     | 13 +++++++++++++
 spec/acceptance/nodesets/docker/ubuntu-16.04.yml |  2 +-
 7 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 .rspec_parallel
 create mode 100644 spec/acceptance/nodesets/archlinux-2-x64.yml

diff --git a/.gitignore b/.gitignore
index 0d629b0c..e9b3cf4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ Puppetfile.lock
 *.iml
 .*.sw?
 .yardoc/
+Guardfile
diff --git a/.msync.yml b/.msync.yml
index 540f0cea..4abde220 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.21.0'
+modulesync_config_version: '0.21.3'
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 00000000..e4d136b7
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1 @@
+--format progress
diff --git a/.rubocop.yml b/.rubocop.yml
index 4e113f03..d92e4e45 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,6 +11,7 @@ AllCops:
     - spec/fixtures/**/*
     - Gemfile
     - Rakefile
+    - Guardfile
 Lint/ConditionPosition:
   Enabled: True
 
@@ -502,6 +503,10 @@ Style/ClosingParenthesisIndentation:
 
 # RSpec
 
+RSpec/BeforeAfterAll:
+  Exclude:
+    - spec/acceptance/**/*
+
 # We don't use rspec in this way
 RSpec/DescribeClass:
   Enabled: False
@@ -521,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 d35336cb..0914f7cb 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/spec/acceptance/nodesets/archlinux-2-x64.yml b/spec/acceptance/nodesets/archlinux-2-x64.yml
new file mode 100644
index 00000000..89b63003
--- /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
diff --git a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml
index 92a93cb7..bac2d5b3 100644
--- a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml
+++ b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml
@@ -10,7 +10,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y net-tools wget'
+      - 'apt-get install -y net-tools wget locales'
       - 'locale-gen en_US.UTF-8'
 CONFIG:
   trace_limit: 200