Skip to content

Commit 140e965

Browse files
author
carabasdaniel
authored
Merge pull request #520 from tphoney/FM-7709
(FM-7709) pdksync and remove beaker
2 parents e358b3b + 224e4be commit 140e965

File tree

4 files changed

+3
-26
lines changed

4 files changed

+3
-26
lines changed

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GetText:
2626
GetText/DecorateString:
2727
Description: We don't want to decorate test output.
2828
Exclude:
29-
- spec/*
29+
- spec/**/*
3030
RSpec/BeforeAfterAll:
3131
Description: Beware of using after(:all) as it may cause state to leak between tests.
3232
A necessary evil in acceptance testing.

.sync.yml

-18
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,6 @@ appveyor.yml:
1313
delete: true
1414

1515
Gemfile:
16-
required:
17-
':system_tests':
18-
- gem: 'puppet-module-posix-system-r#{minor_version}'
19-
platforms: ruby
20-
- gem: 'puppet-module-win-system-r#{minor_version}'
21-
platforms:
22-
- mswin
23-
- mingw
24-
- x64_mingw
25-
':development':
26-
- gem: 'puppet_litmus'
27-
platforms:
28-
- ruby
29-
- mswin
30-
- mingw
31-
- x64_mingw
32-
condition: "ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}"
3316
optional:
3417
':development':
3518
- gem: 'github_changelog_generator'
@@ -39,7 +22,6 @@ Gemfile:
3922

4023
Rakefile:
4124
changelog_user: puppetlabs
42-
use_litmus_tasks: true
4325

4426
spec/spec_helper.rb:
4527
mock_with: ':rspec'

Gemfile

-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,8 @@ group :development do
2727
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
2828
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2929
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30-
gem "puppet_litmus", require: false, platforms: [:ruby, :mswin, :mingw, :x64_mingw] if ENV['PUPPET_GEM_VERSION'].nil? or ENV['PUPPET_GEM_VERSION'] !~ %r{ 5}
3130
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')
3231
end
33-
group :system_tests do
34-
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
35-
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
36-
end
3732

3833
puppet_version = ENV['PUPPET_GEM_VERSION']
3934
facter_version = ENV['FACTER_GEM_VERSION']

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
}
9191
],
9292
"description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Amazon Linux and Gentoo.",
93-
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
94-
"template-ref": "heads/master-0-g7827fc2",
93+
"template-url": "https://github.com/puppetlabs/pdk-templates/#master",
94+
"template-ref": "heads/master-0-g2b33205",
9595
"pdk-version": "1.10.0"
9696
}

0 commit comments

Comments
 (0)