beaker_puppet_helpers 1.1.0 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/release.yml +1 -1
  3. data/.github/workflows/test.yml +7 -3
  4. data/CHANGELOG.md +22 -1
  5. data/Gemfile +1 -0
  6. data/README.md +1 -1
  7. data/Rakefile +2 -2
  8. data/beaker_puppet_helpers.gemspec +1 -1
  9. data/lib/beaker_puppet_helpers/install_utils.rb +7 -1
  10. data/lib/beaker_puppet_helpers/module_utils.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fa0f4a5c8f1fdf3af5e5d2e70344d6a66eb57dccea809afa8874d0c2042a9909
4
- data.tar.gz: 2b8869cdffac42895c8d45f2f7efed1a49acf0333208fde932fab6c779790667
3
+ metadata.gz: 3d0550fb9dda46a2effd035d07f81640e6e4e6e622ebd0866a5fc08f301d5947
4
+ data.tar.gz: 859a99675ab7977f47610b4a726876eac05ba76a9985785f8a2f1c3a2d2ed244
5
5
  SHA512:
6
- metadata.gz: d00617272c372496bf6c6512f05b6efc3800c8bac1618d3b5e30dfa91f808fd8c940dadceea9283a37104c2c63e2e7c6beb9c5e0bd62b5a228424d72c700043e
7
- data.tar.gz: 4f6556760ce3963f0502fe55f03f9881f4b86d39e623089cc8a767abdcef53010161ad7b533442745174c021d6e865e69f101136d4464c71c323c4f0f8a4563f
6
+ metadata.gz: bb98aef7ffafa80edb343acdf211a7b7006a6dff6b39677e6bc8567f2f04bc4c3dc4a3b68c02d0d4e7f0aa944790f90e73f95b9ae1699164954d0365c7c046ce
7
+ data.tar.gz: 9a7c6dd3be79c2b72a241dc69aba3f9a383ff17f53c758ed645f62492a0256e4a4f53842c3027cb45dada00b2799dda39150c9ea98729889caa86648cb468a1a
data/.github/workflows/release.yml CHANGED
@@ -10,7 +10,7 @@ jobs:
10
10
  runs-on: ubuntu-latest
11
11
  if: github.repository_owner == 'voxpupuli'
12
12
  steps:
13
- - uses: actions/checkout@v3
13
+ - uses: actions/checkout@v4
14
14
  - name: Install Ruby 3.0
15
15
  uses: ruby/setup-ruby@v1
16
16
  with:
data/.github/workflows/test.yml CHANGED
@@ -1,6 +1,10 @@
1
1
  name: CI
2
2
 
3
- on: pull_request
3
+ on:
4
+ pull_request: {}
5
+ push:
6
+ branches:
7
+ - master
4
8
 
5
9
  env:
6
10
  BEAKER_HYPERVISOR: docker
@@ -11,7 +15,7 @@ jobs:
11
15
  runs-on: ubuntu-latest
12
16
  name: Rubocop
13
17
  steps:
14
- - uses: actions/checkout@v3
18
+ - uses: actions/checkout@v4
15
19
  - name: Install Ruby ${{ matrix.ruby }}
16
20
  uses: ruby/setup-ruby@v1
17
21
  with:
@@ -32,7 +36,7 @@ jobs:
32
36
  - "2.7"
33
37
  name: Ruby ${{ matrix.ruby }}
34
38
  steps:
35
- - uses: actions/checkout@v3
39
+ - uses: actions/checkout@v4
36
40
  - name: Install Ruby ${{ matrix.ruby }}
37
41
  uses: ruby/setup-ruby@v1
38
42
  with:
data/CHANGELOG.md CHANGED
@@ -2,6 +2,28 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.2.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.2.0) (2023-10-17)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.1.1...1.2.0)
8
+
9
+ **Implemented enhancements:**
10
+
11
+ - Always use puppet-agent for Debian 12+ & Ubuntu 23.04+ [\#37](https://github.com/voxpupuli/beaker_puppet_helpers/pull/37) ([ekohl](https://github.com/ekohl))
12
+
13
+ ## [1.1.1](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.1.1) (2023-06-16)
14
+
15
+ [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.1.0...1.1.1)
16
+
17
+ **Fixed bugs:**
18
+
19
+ - fix typo in EL package selection [\#32](https://github.com/voxpupuli/beaker_puppet_helpers/pull/32) ([bastelfreak](https://github.com/bastelfreak))
20
+
21
+ **Merged pull requests:**
22
+
23
+ - CI: Run on PRs+merges to master [\#33](https://github.com/voxpupuli/beaker_puppet_helpers/pull/33) ([bastelfreak](https://github.com/bastelfreak))
24
+ - README.md: Correct link to CI jobs [\#30](https://github.com/voxpupuli/beaker_puppet_helpers/pull/30) ([bastelfreak](https://github.com/bastelfreak))
25
+ - GCG: Add faraday-retry dep [\#29](https://github.com/voxpupuli/beaker_puppet_helpers/pull/29) ([bastelfreak](https://github.com/bastelfreak))
26
+
5
27
  ## [1.1.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.1.0) (2023-06-01)
6
28
 
7
29
  [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.0.1...1.1.0)
@@ -40,7 +62,6 @@ All notable changes to this project will be documented in this file.
40
62
  - Fix various RSpec cops before enabling rubocop-rspec [\#13](https://github.com/voxpupuli/beaker_puppet_helpers/pull/13) ([ekohl](https://github.com/ekohl))
41
63
  - Drop Ruby 2.5 and 2.6 support [\#12](https://github.com/voxpupuli/beaker_puppet_helpers/pull/12) ([ekohl](https://github.com/ekohl))
42
64
  - Make RuboCop mostly happy [\#11](https://github.com/voxpupuli/beaker_puppet_helpers/pull/11) ([ekohl](https://github.com/ekohl))
43
- - Bump actions/checkout from 2 to 3 [\#10](https://github.com/voxpupuli/beaker_puppet_helpers/pull/10) ([dependabot[bot]](https://github.com/apps/dependabot))
44
65
  - Simplify variable setting [\#9](https://github.com/voxpupuli/beaker_puppet_helpers/pull/9) ([ekohl](https://github.com/ekohl))
45
66
  - Use rubocop config from voxpupuli-rubocop [\#6](https://github.com/voxpupuli/beaker_puppet_helpers/pull/6) ([bastelfreak](https://github.com/bastelfreak))
46
67
  - dependabot: check for github actions and gems [\#5](https://github.com/voxpupuli/beaker_puppet_helpers/pull/5) ([bastelfreak](https://github.com/bastelfreak))
data/Gemfile CHANGED
@@ -28,5 +28,6 @@ when 'vagrant', 'vagrant_libvirt'
28
28
  end
29
29
 
30
30
  group :release do
31
+ gem 'faraday-retry', require: false
31
32
  gem 'github_changelog_generator', require: false
32
33
  end
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # Beaker Puppet Helpers
2
2
 
3
3
  [![License](https://img.shields.io/github/license/voxpupuli/beaker_puppet_helpers.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/blob/master/LICENSE)
4
- [![Test](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/ci.yml/badge.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/ci.yml)
4
+ [![Test](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/test.yml)
5
5
  [![Release](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/release.yml)
6
6
  [![RubyGem Version](https://img.shields.io/gem/v/beaker_puppet_helpers.svg)](https://rubygems.org/gems/beaker_puppet_helpers)
7
7
  [![RubyGem Downloads](https://img.shields.io/gem/dt/beaker_puppet_helpers.svg)](https://rubygems.org/gems/beaker_puppet_helpers)
data/Rakefile CHANGED
@@ -35,7 +35,7 @@ DESC
35
35
  task :acceptance do
36
36
  hosts = {
37
37
  aio: %w[centos7 centos8 debian10 debian11],
38
- foss: %w[debian10 debian11],
38
+ foss: %w[debian10 debian11 debian12 fedora37 fedora38],
39
39
  }
40
40
  default_hosts = hosts.map { |type, h| h.map { |host| "#{host}-64{type=#{type}}" }.join('-') }.join('-')
41
41
  hosts = ENV['BEAKER_HOSTS'] || default_hosts
@@ -66,7 +66,7 @@ rescue LoadError
66
66
  else
67
67
  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
68
68
  config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
69
- config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog]
69
+ config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog github_actions]
70
70
  config.user = 'voxpupuli'
71
71
  config.project = 'beaker_puppet_helpers'
72
72
  config.future_release = Gem::Specification.load("#{config.project}.gemspec").version.to_s
data/beaker_puppet_helpers.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = 'beaker_puppet_helpers'
5
- s.version = '1.1.0'
5
+ s.version = '1.2.0'
6
6
  s.authors = ['Vox Pupuli']
7
7
  s.email = ['voxpupuli@groups.io']
8
8
  s.homepage = 'https://github.com/voxpupuli/beaker_puppet_helpers'
data/lib/beaker_puppet_helpers/install_utils.rb CHANGED
@@ -78,10 +78,16 @@ module BeakerPuppetHelpers
78
78
  # @return [String] The Puppet package name
79
79
  def self.puppet_package_name(host, prefer_aio: true)
80
80
  case host['packaging_platform'].split('-', 3).first
81
- when /el-|fedora|sles|cisco_|debian|ubuntu/
81
+ when 'debian'
82
+ # 12 started to ship puppet-agent with puppet as a legacy package
83
+ prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 12 ? 'puppet-agent' : 'puppet'
84
+ when /el|fedora|sles|cisco_/
82
85
  prefer_aio ? 'puppet-agent' : 'puppet'
83
86
  when /freebsd/
84
87
  'sysutils/puppet'
88
+ when 'ubuntu'
89
+ # 23.04 started to ship puppet-agent with puppet as a legacy package
90
+ prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304 ? 'puppet-agent' : 'puppet'
85
91
  else
86
92
  'puppet'
87
93
  end
data/lib/beaker_puppet_helpers/module_utils.rb CHANGED
@@ -6,7 +6,7 @@ require 'puppet/modulebuilder'
6
6
  module BeakerPuppetHelpers
7
7
  # Methods to help install puppet modules
8
8
  module ModuleUtils
9
- # Install the desired module with the PMT on a given host
9
+ # Install the desired module with the Puppet Module Tool (PMT) on a given host
10
10
  #
11
11
  # @param [Beaker::Host, Array<Beaker::Host>, String, Symbol] hosts
12
12
  # One or more hosts to act upon, or a role (String or Symbol) that
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker_puppet_helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-01 00:00:00.000000000 Z
11
+ date: 2023-10-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: beaker