Skip to content

Commit b993552

Browse files
committed
(CONT-494) Fix for .sync.yml
1 parent a678898 commit b993552

File tree

10 files changed

+35
-152
lines changed

10 files changed

+35
-152
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.puppet-lint.rc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
--relative
2+
--no-parameter_documentation-check
3+
--no-params_empty_string_assignment-check
4+
--no-file_ensure-check
5+
--no-variables_not_enclosed-check

.rubocop.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require:
44
- rubocop-rspec
55
AllCops:
66
DisplayCopNames: true
7-
TargetRubyVersion: '2.5'
7+
TargetRubyVersion: '2.4'
88
Include:
99
- "**/*.rb"
1010
Exclude:
@@ -18,6 +18,16 @@ AllCops:
1818
- "**/Puppetfile"
1919
- "**/Vagrantfile"
2020
- "**/Guardfile"
21+
- tooling/kube_tool/*
22+
- tooling/*
23+
- spec/defines/*
24+
- spec/classes/*
25+
- spec/*
26+
- spec/acceptance/*
27+
- rakelib/*
28+
- plans/*.pp
29+
- tasks/*
30+
inherit_from: ".rubocop_todo.yml"
2131
Layout/LineLength:
2232
Description: People have wide screens, use them.
2333
Max: 200

.sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Gemfile:
99
optional:
1010
':development':
1111
- gem: 'github_changelog_generator'
12-
version: '= 1.15.2'
12+
version: '= 1.15.2'
1313

1414
Rakefile:
1515
changelog_user: puppetlabs

.travis.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ group :development do
3434
gem "rubocop-performance", '= 1.9.1', require: false
3535
gem "rubocop-rspec", '= 2.0.1', require: false
3636
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
gem "github_changelog_generator", '= 1.15.2', require: false
3738
end
3839
group :system_tests do
3940
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]

Rakefile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').a
1010

1111
def changelog_user
1212
return unless Rake.application.top_level_tasks.include? "changelog"
13-
returnVal = nil || JSON.load(File.read('metadata.json'))['author']
13+
returnVal = "puppetlabs" || JSON.load(File.read('metadata.json'))['author']
1414
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
1515
puts "GitHubChangelogGenerator user:#{returnVal}"
1616
returnVal
@@ -42,13 +42,18 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45+
PuppetLint.configuration.send('disable_parameter_documentation')
46+
PuppetLint.configuration.send('disable_params_empty_string_assignment')
47+
PuppetLint.configuration.send('disable_file_ensure')
48+
PuppetLint.configuration.send('disable_variables_not_enclosed')
4549

4650

4751
if Bundler.rubygems.find_name('github_changelog_generator').any?
4852
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
4953
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
5054
config.user = "#{changelog_user}"
5155
config.project = "#{changelog_project}"
56+
config.since_tag = "4.0.0"
5257
config.future_release = "#{changelog_future_release}"
5358
config.exclude_labels = ['maintenance']
5459
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
@@ -87,3 +92,11 @@ EOM
8792
end
8893
end
8994

95+
require 'rspec/core/rake_task'
96+
namespace :kubernetes do
97+
RSpec::Core::RakeTask.new(:integration) do |t|
98+
t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
99+
t.rspec_opts = "--tag integration"
100+
end
101+
end
102+

appveyor.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"version_requirement": ">= 6.24.0 < 8.0.0"
6969
}
7070
],
71-
"pdk-version": "2.5.0",
71+
"pdk-version": "2.6.0",
7272
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
73-
"template-ref": "2.7.1-0-g9a16c87"
73+
"template-ref": "heads/main-0-g434e063"
7474
}

spec/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
RSpec.configure do |c|
4040
c.default_facts = default_facts
41+
c.hiera_config = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/hiera/hiera.yaml'))
4142
c.before :each do
4243
# set to strictest setting for testing
4344
# by default Puppet runs at warning level
@@ -46,6 +47,7 @@
4647
end
4748
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4849
c.after(:suite) do
50+
RSpec::Puppet::Coverage.report!(0)
4951
end
5052

5153
# Filter backtrace noise

0 commit comments

Comments
 (0)