(FM-7709) pdksync and remove beaker

diff --git a/.rubocop.yml b/.rubocop.yml
index 413a6442f5cc2420825a2da8db39063f024a0a52..ee74e8cbb291de546018ba3ea02860c589902f2a 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -26,7 +26,7 @@ GetText:
 GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
-  - spec/*
+  - spec/**/*
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.

diff --git a/.sync.yml b/.sync.yml
index 947242e2e843a605795f8857df4dd40ee61f1fdc..090130d48da94108e11f6dc025cbce2048bb81fc 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -20,16 +20,6 @@ appveyor.yml:
   delete: true
 
 Gemfile:
-  required:
-    ':development':
-      - gem: 'puppet_litmus'
-        platforms:
-          - ruby
-          - mswin
-          - mingw
-          - x64_mingw
-        condition: "ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}"
-      - gem: 'serverspec'
   optional:
     ':development':
       - gem: 'github_changelog_generator'
@@ -41,7 +31,6 @@ Gemfile:
 Rakefile:
   requires:
     - puppet_pot_generator/rake_tasks
-  use_litmus_tasks: true
 
 spec/spec_helper.rb:
   mock_with: ':rspec'

diff --git a/Gemfile b/Gemfile
index 070bd8bf2b32a75f43b86c57b53b6a9282ddb140..0287895032a3546052df5abc06c82a15b7b7a10b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -27,8 +27,6 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet_litmus",                                           require: false, platforms: [:ruby, :mswin, :mingw, :x64_mingw] if ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}
-  gem "serverspec",                                              require: false
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
   gem "puppet-lint-i18n",                                        require: false
 end

diff --git a/metadata.json b/metadata.json
index 7995122c16cc269458002fff52ed1aff93192280..c21c399c87d4e243594ef96673b81b9c28f306f1 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -41,6 +41,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates/#master",
-  "template-ref": "heads/master-0-g7827fc2",
+  "template-ref": "heads/master-0-g2b33205",
   "pdk-version": "1.10.0"
 }