Skip to content

Commit 3ec4ce9

Browse files
committed
foo
1 parent a67d49d commit 3ec4ce9

File tree

9 files changed

+37
-64
lines changed

9 files changed

+37
-64
lines changed

.fixtures.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fixtures:
22
repositories:
3-
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
3+
stdlib:
4+
repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
5+
puppet_version: "< 9.0.0"
46
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
57
augeasproviders_core: "https://github.com/voxpupuli/puppet-augeasproviders_core.git"
68
augeasproviders_shellvar: "https://github.com/voxpupuli/puppet-augeasproviders_shellvar.git"
@@ -11,5 +13,6 @@ fixtures:
1113
repo: "https://github.com/puppetlabs/puppetlabs-mount_core.git"
1214
puppet_version: ">= 6.0.0"
1315
transition: "https://github.com/puppetlabs/puppetlabs-transition.git"
16+
filepath: "https://github.com/EdgeJ/puppet-filepath.git"
1417
symlinks:
1518
"nfs": "#{source_dir}"

.github/workflows/test-suite.yaml

Lines changed: 9 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
puppet: [7.22.0]
15-
ruby: [2.7.7, 3.0.5, 3.1.3]
14+
puppet: [7.0.0, 8.2.0]
15+
ruby: [3.1.3, 3.2.0]
1616

17-
name: Static code analysis
18-
runs-on: ubuntu-20.04
17+
name: Static code analysis new
18+
runs-on: ubuntu-latest
1919
permissions:
2020
contents: read
2121

@@ -50,58 +50,17 @@ jobs:
5050
run: |
5151
PUPPET_VERSION=${{ matrix.puppet }} bundle exec rake rubocop
5252
53-
test-static-old:
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
puppet: [5.5.22, 6.29.0]
58-
ruby: [2.5.9, 2.6.9]
59-
60-
name: Static code analysis
61-
runs-on: ubuntu-20.04
62-
permissions:
63-
contents: read
64-
65-
steps:
66-
- uses: actions/checkout@v3
67-
68-
- name: Set up Ruby
69-
uses: ruby/setup-ruby@v1
70-
with:
71-
ruby-version: ${{ matrix.ruby }}
72-
bundler-cache: true
73-
env:
74-
PUPPET_VERSION: ${{ matrix.puppet }}
75-
76-
- name: Run metadata lint
77-
run: |
78-
PUPPET_VERSION=${{ matrix.puppet }} bundle exec rake metadata_lint
79-
80-
- name: Run puppet lint
81-
run: |
82-
PUPPET_VERSION=${{ matrix.puppet }} bundle exec rake lint
83-
84-
- name: Run puppet syntax check
85-
run: |
86-
PUPPET_VERSION=${{ matrix.puppet }} bundle exec rake syntax
87-
88-
- name: Run puppet rspec tests
89-
run: |
90-
PUPPET_VERSION=${{ matrix.puppet }} STRICT_VARIABLES=yes bundle exec rake spec
91-
92-
- name: Run rubocop tests
93-
run: |
94-
PUPPET_VERSION=${{ matrix.puppet }} bundle exec rake rubocop
9553
9654
test-integration:
55+
if: false
9756
strategy:
9857
fail-fast: false
9958
matrix:
100-
puppet: [puppet6, puppet7]
59+
puppet: [7.0.0, 8.0.0]
10160
beakerset: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, centos-7, debian-10, debian-11]
10261

10362
name: Integration tests
104-
runs-on: ubuntu-20.04
63+
runs-on: ubuntu-latest
10564
permissions:
10665
contents: read
10766

@@ -111,7 +70,7 @@ jobs:
11170
- name: Set up Ruby
11271
uses: ruby/setup-ruby@v1
11372
with:
114-
ruby-version: 2.6.9
73+
ruby-version: 2.7
11574
bundler-cache: true
11675
env:
11776
BEAKER_set: ${{ matrix.beakerset }}
@@ -125,3 +84,4 @@ jobs:
12584
BEAKER_set: ${{ matrix.beakerset }}
12685
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet }}
12786
PUPPET_INSTALL_TYPE: agent
87+

.rubocop.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,4 +571,7 @@ Style/MixinUsage:
571571
Enabled: false
572572

573573
EmptyExampleGroup:
574-
Enabled: false
574+
Enabled: false
575+
576+
inherit_gem:
577+
voxpupuli-test: rubocop.yml

Gemfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ end
1313
group :test do
1414
gem 'metadata-json-lint', require: false
1515
gem 'puppet-blacksmith', require: false, git: 'https://github.com/voxpupuli/puppet-blacksmith.git'
16-
gem 'puppet-lint', require: false, git: 'https://github.com/rodjek/puppet-lint.git'
17-
gem 'puppet-lint-absolute_classname-check', require: false
18-
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', require: false
19-
gem 'puppet-lint-leading_zero-check', require: false
20-
gem 'puppet-lint-trailing_comma-check', require: false
21-
gem 'puppet-lint-unquoted_string-check', require: false
22-
gem 'puppet-lint-variable_contains_upcase', require: false
23-
gem 'puppet-lint-version_comparison-check', require: false
16+
# gem 'puppet-lint', require: false, git: 'https://github.com/rodjek/puppet-lint.git'
17+
# gem 'puppet-lint-absolute_classname-check', require: false
18+
# gem 'puppet-lint-classes_and_types_beginning_with_digits-check', require: false
19+
# gem 'puppet-lint-leading_zero-check', require: false
20+
# gem 'puppet-lint-trailing_comma-check', require: false
21+
# gem 'puppet-lint-unquoted_string-check', require: false
22+
# gem 'puppet-lint-variable_contains_upcase', require: false
23+
# gem 'puppet-lint-version_comparison-check', require: false
2424
gem 'puppet-strings', require: false
2525
gem 'puppet-syntax', require: false
2626
gem 'puppetlabs_spec_helper', require: false
@@ -58,5 +58,7 @@ end
5858

5959
puppetversion = ENV['PUPPET_VERSION'].nil? ? '~> 4.0' : ENV['PUPPET_VERSION'].to_s
6060
gem 'puppet', puppetversion, require: false, groups: [:test]
61+
gem 'voxpupuli-test'
62+
gem 'voxpupuli-acceptance'
6163

6264
# vim:ft=ruby

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ require 'puppet-syntax/tasks/puppet-syntax'
44
require 'metadata-json-lint/rake_task'
55
require 'puppet_blacksmith/rake_tasks'
66
require 'voxpupuli/release/rake_tasks'
7+
require 'voxpupuli/test/rake_tasks'
78
require 'rubocop/rake_task'
89
require 'puppet-strings/tasks'
910

manifests/functions/create_export.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151

5252
unless defined(File[$name]) {
5353
filepath { $name:
54-
ensure => present,
55-
owner => $owner,
56-
group => $group,
57-
mode => $mode,
54+
ensure => present,
55+
owner => $owner,
56+
group => $group,
57+
mode => $mode,
5858
}
5959
}
6060
}

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"project_page": "https://github.com/derdanne/puppet-nfs",
99
"issues_url": "https://github.com/derdanne/puppet-nfs/issues",
1010
"dependencies": [
11-
{"name":"puppetlabs/stdlib","version_requirement":">= 4.5.0 < 9.0.0"},
11+
{"name":"puppetlabs/stdlib","version_requirement":">= 7.0.0 < 8.0.0"},
1212
{"name":"puppetlabs/concat","version_requirement":">= 1.1.2 < 8.0.0"},
1313
{"name":"puppetlabs/transition","version_requirement":">= 0.1.0 < 2.0.0"},
1414
{"name":"puppet/augeasproviders_core","version_requirement":">= 2.1.5 < 4.0.0"},

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
end
66

77
require 'puppetlabs_spec_helper/module_spec_helper'
8+
require 'voxpupuli/test/spec_helper'
89
require 'rspec-puppet-facts'
910
include RspecPuppetFacts
1011

spec/spec_helper_acceptance.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# frozen_string_literal: true
2+
require 'voxpupuli/acceptance/spec_helper_acceptance'
3+
4+
configure_beaker
25

36
RSpec.configure do |c|
47
c.mock_with :rspec

0 commit comments

Comments
 (0)