Skip to content

Commit 655e399

Browse files
committed
(maint) update to PDK 1.17
While updating Rakefile.
1 parent b62b085 commit 655e399

File tree

7 files changed

+30
-17
lines changed

7 files changed

+30
-17
lines changed

.rubocop.yml

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ GetText/DecorateString:
2727
Description: We don't want to decorate test output.
2828
Exclude:
2929
- spec/**/*
30+
Enabled: false
3031
RSpec/BeforeAfterAll:
3132
Description: Beware of using after(:all) as it may cause state to leak between tests.
3233
A necessary evil in acceptance testing.
@@ -88,6 +89,12 @@ Style/MethodCalledOnDoEndBlock:
8889
Enabled: true
8990
Style/StringMethods:
9091
Enabled: true
92+
GetText/DecorateFunctionMessage:
93+
Enabled: false
94+
GetText/DecorateStringFormattingUsingInterpolation:
95+
Enabled: false
96+
GetText/DecorateStringFormattingUsingPercent:
97+
Enabled: false
9198
Layout/EndOfLine:
9299
Enabled: false
93100
Layout/IndentHeredoc:

.travis.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
---
2+
os: linux
23
dist: xenial
34
language: ruby
45
cache: bundler
56
before_install:
67
- bundle -v
78
- rm -f Gemfile.lock
8-
- gem update --system $RUBYGEMS_VERSION
9+
- "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
10+
- "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
11+
- "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
12+
- '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
913
- gem --version
1014
- bundle -v
1115
script:
1216
- 'bundle exec rake $CHECK'
1317
bundler_args: --without system_tests
1418
rvm:
15-
- 2.5.3
19+
- 2.5.7
1620
stages:
1721
- static
1822
- spec
1923
- acceptance
2024
-
2125
if: tag =~ ^v\d
2226
name: deploy
23-
matrix:
27+
jobs:
2428
fast_finish: true
2529
include:
2630
-
@@ -32,14 +36,14 @@ matrix:
3236
stage: spec
3337
-
3438
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
35-
rvm: 2.5.3
39+
rvm: 2.5.7
3640
stage: spec
37-
-
38-
env: DEPLOY_TO_FORGE=yes
39-
stage: deploy
4041
-
4142
env: PUPPET_GEM_VERSION="= 4.6.1" CHECK=parallel_spec
4243
rvm: 2.1.9
44+
-
45+
env: DEPLOY_TO_FORGE=yes
46+
stage: deploy
4347
branches:
4448
only:
4549
- master

Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ group :development do
2424
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2525
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2626
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
28-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
29-
gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30-
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
28+
gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
29+
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
30+
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
end
3232

3333
puppet_version = ENV['PUPPET_GEM_VERSION']

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
24
require 'puppetlabs_spec_helper/rake_tasks'
35
require 'puppet-syntax/tasks/puppet-syntax'
@@ -39,8 +41,6 @@ def changelog_future_release
3941
end
4042

4143
PuppetLint.configuration.send('disable_relative')
42-
PuppetLint.configuration.send('disable_2sp_soft_tabs')
43-
PuppetLint.configuration.send('disable_arrow_alignment')
4444

4545
if Bundler.rubygems.find_name('github_changelog_generator').any?
4646
GitHubChangelogGenerator::RakeTask.new :changelog do |config|

metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"version_requirement": ">= 5.5.0"
7878
}
7979
],
80-
"pdk-version": "1.14.0.pre (heads/master-0-g9158517)",
81-
"template-url": "https://github.com/puppetlabs/pdk-templates#add_circleci_and_azure_pipelines_support",
82-
"template-ref": "remotes/origin/add_circleci_and_azure_pipelines_support-0-gdc89556"
80+
"pdk-version": "1.17.0",
81+
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
82+
"template-ref": "tags/1.17.0-0-gd3a4319"
8383
}

spec/default_facts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Facts specified here will override the values provided by rspec-puppet-facts.
44
---
55
ipaddress: "172.16.254.254"
6+
ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
67
is_pe: false
78
macaddress: "AA:AA:AA:AA:AA:AA"
89
pe_server_version: 2018.1.0
@@ -14,4 +15,3 @@ processors:
1415
count: 8
1516
pe_postgresql_info:
1617
installed_server_version: 9.6
17-

spec/spec_helper.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
RSpec.configure do |c|
24
c.mock_with :rspec
35
end

0 commit comments

Comments
 (0)