Skip to content

Commit

Permalink
Merge pull request #176 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
  • Loading branch information
smortex authored Aug 18, 2023
2 parents 1febc02 + d8d80c9 commit 7b0c340
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 12 deletions.
11 changes: 7 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
with:

```sh
BEAKER_setfile=debian11-64 bundle exec rake beaker
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

You can replace the string `debian10` with any common operating system.
You can replace the string `debian11` with any common operating system.
The following strings are known to work:

* ubuntu1804
* ubuntu2004
* debian10
* ubuntu2204
* debian11
* centos7
* centos8
* centos9
* almalinux8
* almalinux9
* fedora36

For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).

Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '6.0.0'
modulesync_config_version: '7.0.0'
17 changes: 14 additions & 3 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2022-12-14 08:02:15 UTC using RuboCop version 1.22.3.
# on 2023-08-17 21:32:43 UTC using RuboCop version 1.50.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 5
# This cop supports unsafe autocorrection (--autocorrect-all).
RSpec/BeEq:
Exclude:
- 'spec/functions/register_spec.rb'
- 'spec/functions/register_to_file_spec.rb'
- 'spec/functions/to_toml_spec.rb'
- 'spec/functions/unregister_from_file_spec.rb'
- 'spec/functions/unregister_spec.rb'

# Offense count: 1
# Cop supports --auto-correct.
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: MinBranchesCount.
Style/CaseLikeIf:
Exclude:
- 'lib/puppet_x/gitlab/dumper.rb'

# Offense count: 3
# Cop supports --auto-correct.
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: Mode.
Style/StringConcatenation:
Exclude:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 6.0', :require => false
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 3.0', :require => false
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/gitlab_ci_runner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
is_expected.to contain_yumrepo('runner_gitlab-runner').
with(
ensure: 'present',
baseurl: "https://packages.gitlab.com/runner/gitlab-runner/el/#{os_release_version}/\$basearch",
baseurl: "https://packages.gitlab.com/runner/gitlab-runner/el/#{os_release_version}/$basearch",
descr: 'runner_gitlab-runner',
enabled: '1',
gpgcheck: '0',
Expand Down
3 changes: 1 addition & 2 deletions spec/defines/runner_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@
context 'with name not included in config' do
let(:params) do
{
config: {
}
config: {}
}
end

Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
end

require 'spec_helper_local'
Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }

0 comments on commit 7b0c340

Please sign in to comment.