Skip to content

Commit 549c031

Browse files
authored
Merge pull request #671 from puppetlabs/CAT-1696-fix-ci-pipeline
(CAT-1696) - Fixing pipeline
2 parents a940ee9 + 77df378 commit 549c031

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

.rubocop.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,8 @@ Lint/DuplicateBranch:
531531
Enabled: false
532532
Lint/DuplicateMagicComment:
533533
Enabled: false
534+
Lint/DuplicateMatchPattern:
535+
Enabled: false
534536
Lint/DuplicateRegexpCharacterClassElement:
535537
Enabled: false
536538
Lint/EmptyBlock:
@@ -647,6 +649,8 @@ Style/ComparableClamp:
647649
Enabled: false
648650
Style/ConcatArrayLiterals:
649651
Enabled: false
652+
Style/DataInheritance:
653+
Enabled: false
650654
Style/DirEmpty:
651655
Enabled: false
652656
Style/DocumentDynamicEvalDefinition:
@@ -715,6 +719,8 @@ Style/RedundantHeredocDelimiterQuotes:
715719
Enabled: false
716720
Style/RedundantInitialize:
717721
Enabled: false
722+
Style/RedundantLineContinuation:
723+
Enabled: false
718724
Style/RedundantSelfAssignmentBranch:
719725
Enabled: false
720726
Style/RedundantStringEscape:

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
33
"puppet.puppet-vscode",
4-
"shopify.ruby-lsp"
4+
"rebornix.Ruby"
55
]
66
}

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ group :development do
2323
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
2424
gem "facterdb", '~> 1.18', require: false
2525
gem "metadata-json-lint", '~> 3.0', require: false
26-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
26+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
2727
gem "rspec-puppet-facts", '~> 2.0', require: false
2828
gem "codecov", '~> 0.2', require: false
2929
gem "dependency_checker", '~> 1.0.0', require: false
3030
gem "parallel_tests", '= 3.12.1', require: false
3131
gem "pry", '~> 0.10', require: false
3232
gem "simplecov-console", '~> 0.5', require: false
3333
gem "puppet-debugger", '~> 1.0', require: false
34-
gem "rubocop", '= 1.48.1', require: false
34+
gem "rubocop", '= 1.50.0', require: false
3535
gem "rubocop-performance", '= 1.16.0', require: false
3636
gem "rubocop-rspec", '= 2.19.0', require: false
3737
gem "puppet-strings", '~> 4.0', require: false

Rakefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
88

99
PuppetLint.configuration.send('disable_relative')
1010
PuppetLint.configuration.send('disable_params_empty_string_assignment')
11+
12+
require 'rspec/core/rake_task'
13+
namespace :kubernetes do
14+
RSpec::Core::RakeTask.new(:integration) do |t|
15+
t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
16+
t.rspec_opts = "--tag integration"
17+
end
18+
end

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@
7070
],
7171
"pdk-version": "3.0.0",
7272
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
73-
"template-ref": "heads/main-0-g79a2f93"
73+
"template-ref": "heads/main-0-ge864fa6"
7474
}

0 commit comments

Comments
 (0)