simp-beaker-helpers 1.31.0 → 1.32.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/Gemfile +3 -3
  4. data/lib/simp/beaker_helpers/constants.rb +1 -1
  5. data/lib/simp/beaker_helpers/version.rb +1 -1
  6. data/simp-beaker-helpers.gemspec +9 -9
  7. data/spec/acceptance/nodesets/amzn2.yml +4 -12
  8. data/spec/acceptance/nodesets/default.yml +5 -5
  9. data/spec/acceptance/nodesets/docker.yml +6 -7
  10. data/spec/acceptance/nodesets/oel.yml +4 -12
  11. data/spec/acceptance/nodesets/ubuntu.yml +2 -2
  12. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f45055d8c6080e06fd0c7b6e4ebe9d7dc9653a811f438f922313b22ff1bc1678
4
- data.tar.gz: 0725f20181c9a5ff343642c4594427e91e89ba0b3274acd7be3f2c99c3afc5e2
3
+ metadata.gz: 61e6231d0cf45fea87d7eb679d94fe902ec1b5af2f95ca21d45e61104f0fdab8
4
+ data.tar.gz: 90972159bcf15d6ab02cad21dc31b1d56321cbbd8681d6bcc2ebcae025f77c53
5
5
  SHA512:
6
- metadata.gz: e2bca2260f68d5852c9add0b8e2b417a57d2c77609509a8d0389bd0dbfaddfaff4c92aacc63df6b8d03c2c6ac63ec4616d3f39726ba1303b44c123a2e20f11cf
7
- data.tar.gz: 559dae19ae5be41c366ef9fde7fdfeb811bff6ad73751a00d1dac2aed0c76a3b34fa5c80cd949e1ff796f1341f488480da5b8a0afb3b5cb2e56097fb25f0bcc8
6
+ metadata.gz: e04d18c50a3de6d8c4d3dacfc69a596ca4063ff29c86bd25ffd10e97b61465fdba218d6140ed9cb2f4d69b01e609e27ee31cd3ace0ba820ebbe69446e86cbbeb
7
+ data.tar.gz: c6979d6fecb5daaef5f739cca62d532c2c32ba5aad5abc3642b41c6e02ba69f840a82139ef14783e9978bd04712edd824c655464ddb99770528514923e1faf88
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ### 1.32.0 / 2023-08-24
2
+ * Added:
3
+ * Switch to Puppet 8 by default
4
+ * Fixed:
5
+ * Update gem dependencies
6
+
1
7
  ### 1.31.0 / 2023-07-18
2
8
  * Fixed:
3
9
  * Compatibility with Ruby 3.2
data/Gemfile CHANGED
@@ -13,7 +13,7 @@ gem 'bundler'
13
13
  gem 'rake'
14
14
 
15
15
  group :system_tests do
16
- beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 5.0.0'])
16
+ beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 6.0.0'])
17
17
 
18
18
  if "#{beaker_gem_options}".include?(':')
19
19
  # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
@@ -44,8 +44,8 @@ group :system_tests do
44
44
  gem 'beaker-rspec'
45
45
  gem 'beaker-windows'
46
46
  gem 'net-ssh'
47
- gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 7.0')
47
+ gem 'puppet', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0'])
48
48
  gem 'rubocop'
49
49
  gem 'rubocop-rspec'
50
- gem 'puppetlabs_spec_helper', '~> 4.0'
50
+ gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 7.0.0'
51
51
  end
data/lib/simp/beaker_helpers/constants.rb CHANGED
@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
5
5
  #
6
6
  # This is done so that we know if some new thing that we're using breaks the
7
7
  # oldest system that we support
8
- DEFAULT_PUPPET_AGENT_VERSION = '~> 7.0'
8
+ DEFAULT_PUPPET_AGENT_VERSION = '~> 8.0'
9
9
 
10
10
  SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
11
11
 
data/lib/simp/beaker_helpers/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Simp; end
2
2
 
3
3
  module Simp::BeakerHelpers
4
- VERSION = '1.31.0'
4
+ VERSION = '1.32.0'
5
5
  end
data/simp-beaker-helpers.gemspec CHANGED
@@ -16,19 +16,19 @@ Gem::Specification.new do |s|
16
16
  s.email = 'simp@simp-project.org'
17
17
  s.homepage = 'https://github.com/simp/rubygem-simp-beaker-helpers'
18
18
  s.metadata = {
19
- 'issue_tracker' => 'https://simp-project.atlassian.net'
19
+ 'issue_tracker' => 'https://github.com/simp/rubygem-simp-beaker-helpers/issues'
20
20
  }
21
21
 
22
22
  s.required_ruby_version = '>= 2.3.0'
23
23
 
24
- s.add_runtime_dependency 'beaker' , ['>= 4.17.0', '< 6.0.0']
25
- s.add_runtime_dependency 'beaker-rspec' , '~> 8.0'
26
- s.add_runtime_dependency 'beaker-puppet' , ['>= 1.18.14', '< 2.0.0']
27
- s.add_runtime_dependency 'beaker-docker' , ['>= 0.8.3', '< 2.0.0']
28
- s.add_runtime_dependency 'docker-api' , ['>= 2.1.0', '< 3.0.0']
29
- s.add_runtime_dependency 'beaker-vagrant' , ['>= 0.6.4', '< 2.0.0']
30
- s.add_runtime_dependency 'highline' , '~> 2.0'
31
- s.add_runtime_dependency 'nokogiri' , '~> 1.8'
24
+ s.add_runtime_dependency 'beaker', ['>= 4.17.0', '< 6.0.0']
25
+ s.add_runtime_dependency 'beaker-rspec', '~> 8.0'
26
+ s.add_runtime_dependency 'beaker-puppet', ['>= 1.18.14', '< 3.0.0']
27
+ s.add_runtime_dependency 'beaker-docker', ['>= 0.8.3', '< 3.0.0']
28
+ s.add_runtime_dependency 'docker-api', ['>= 2.1.0', '< 3.0.0']
29
+ s.add_runtime_dependency 'beaker-vagrant', ['>= 0.6.4', '< 2.0.0']
30
+ s.add_runtime_dependency 'highline', '~> 2.0'
31
+ s.add_runtime_dependency 'nokogiri', '~> 1.8'
32
32
 
33
33
  ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
34
34
  s.files = `git ls-files`.split("\n")
data/spec/acceptance/nodesets/amzn2.yml CHANGED
@@ -1,22 +1,14 @@
1
- <%
2
- if ENV['BEAKER_HYPERVISOR']
3
- hypervisor = ENV['BEAKER_HYPERVISOR']
4
- else
5
- hypervisor = 'vagrant'
6
- end
7
- -%>
1
+ ---
8
2
  HOSTS:
9
3
  amzn2:
10
4
  roles:
11
5
  - default
12
6
  platform: el-7-x86_64
13
7
  box: gbailey/amzn2
14
- hypervisor: <%= hypervisor %>
8
+ hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
15
9
 
16
10
  CONFIG:
17
11
  log_level: verbose
18
- synced_folder : disabled
12
+ synced_folder: disabled
19
13
  type: aio
20
- <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
21
- puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
22
- <% end -%>
14
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
data/spec/acceptance/nodesets/default.yml CHANGED
@@ -2,8 +2,8 @@
2
2
  HOSTS:
3
3
  el7:
4
4
  roles:
5
- - default
6
- - el7
5
+ - default
6
+ - el7
7
7
  platform: el-7-x86_64
8
8
  box: centos/7
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -11,9 +11,9 @@ HOSTS:
11
11
  gce_machine_type: n1-standard-2
12
12
  el8:
13
13
  roles:
14
- - el8
14
+ - el8
15
15
  platform: el-8-x86_64
16
- box: centos/stream8
16
+ box: generic/centos8s
17
17
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
18
18
  family: centos-cloud/centos-stream-8
19
19
  gce_machine_type: n1-standard-2
@@ -33,4 +33,4 @@ CONFIG:
33
33
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
34
34
  hmac:
35
35
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
36
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
36
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
data/spec/acceptance/nodesets/docker.yml CHANGED
@@ -1,27 +1,26 @@
1
+ ---
1
2
  HOSTS:
2
3
  el7.test.net:
3
4
  roles:
4
5
  - default
5
6
  - el7
6
- platform: el-7-x86_64
7
+ platform: el-7-x86_64
7
8
  hypervisor: docker
8
9
  image: simpproject/simp_beaker_el7
9
- docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
10
+ docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
10
11
 
11
12
  el8.test.net:
12
13
  roles:
13
14
  - el8
14
- platform: el-8-x86_64
15
+ platform: el-8-x86_64
15
16
  hypervisor: docker
16
17
  image: simpproject/simp_beaker_el8
17
- docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
18
+ docker_cmd: "/usr/sbin/sshd -D -E /var/log/sshd.log"
18
19
 
19
20
  CONFIG:
20
21
  log_level: verbose
21
22
  type: aio
22
- <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
23
- puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
24
- <% end -%>
23
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
25
24
  ssh:
26
25
  password: root
27
26
  auth_methods:
data/spec/acceptance/nodesets/oel.yml CHANGED
@@ -1,10 +1,4 @@
1
- <%
2
- if ENV['BEAKER_HYPERVISOR']
3
- hypervisor = ENV['BEAKER_HYPERVISOR']
4
- else
5
- hypervisor = 'vagrant'
6
- end
7
- -%>
1
+ ---
8
2
  HOSTS:
9
3
  oel7:
10
4
  roles:
@@ -12,22 +6,20 @@ HOSTS:
12
6
  - el7
13
7
  platform: el-7-x86_64
14
8
  box: generic/oracle7
15
- hypervisor: <%= hypervisor %>
9
+ hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
16
10
 
17
11
  oel8:
18
12
  roles:
19
13
  - el8
20
14
  platform: el-8-x86_64
21
15
  box: generic/oracle8
22
- hypervisor: <%= hypervisor %>
16
+ hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
23
17
 
24
18
  CONFIG:
25
19
  log_level: verbose
26
20
  type: aio
27
21
  vagrant_cpus: 2
28
- <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
29
- puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
30
- <% end -%>
22
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
31
23
  ssh:
32
24
  keepalive: true
33
25
  keepalive_interval: 10
data/spec/acceptance/nodesets/ubuntu.yml CHANGED
@@ -2,7 +2,7 @@
2
2
  HOSTS:
3
3
  focal:
4
4
  roles:
5
- - default
5
+ - default
6
6
  platform: ubuntu-20.04-x86_64
7
7
  box: ubuntu/focal64
8
8
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
@@ -11,4 +11,4 @@ HOSTS:
11
11
  CONFIG:
12
12
  log_level: verbose
13
13
  type: aio
14
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
14
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-beaker-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.31.0
4
+ version: 1.32.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-07-18 00:00:00.000000000 Z
12
+ date: 2023-08-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: beaker
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: 1.18.14
55
55
  - - "<"
56
56
  - !ruby/object:Gem::Version
57
- version: 2.0.0
57
+ version: 3.0.0
58
58
  type: :runtime
59
59
  prerelease: false
60
60
  version_requirements: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
64
64
  version: 1.18.14
65
65
  - - "<"
66
66
  - !ruby/object:Gem::Version
67
- version: 2.0.0
67
+ version: 3.0.0
68
68
  - !ruby/object:Gem::Dependency
69
69
  name: beaker-docker
70
70
  requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  version: 0.8.3
75
75
  - - "<"
76
76
  - !ruby/object:Gem::Version
77
- version: 2.0.0
77
+ version: 3.0.0
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
84
84
  version: 0.8.3
85
85
  - - "<"
86
86
  - !ruby/object:Gem::Version
87
- version: 2.0.0
87
+ version: 3.0.0
88
88
  - !ruby/object:Gem::Dependency
89
89
  name: docker-api
90
90
  requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ homepage: https://github.com/simp/rubygem-simp-beaker-helpers
238
238
  licenses:
239
239
  - Apache-2.0
240
240
  metadata:
241
- issue_tracker: https://simp-project.atlassian.net
241
+ issue_tracker: https://github.com/simp/rubygem-simp-beaker-helpers/issues
242
242
  post_install_message:
243
243
  rdoc_options: []
244
244
  require_paths: