simp-beaker-helpers 1.28.0 → 1.30.0

data/spec/acceptance/suites/windows/nodesets/win2019.yml

@@ -1,33 +1,27 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
+---
 HOSTS:
   win:
     roles:
-      - windows
+    - windows
     platform: windows-server-amd64
     box: gusztavvargadr/windows-server
-    hypervisor: <%= hypervisor %>
+    box_version: "~> 1809"
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
     vagrant_memsize: 2048
     vagrant_cpus: 2
     user: vagrant
-    communicator: winrm
     is_cygwin: false
-
+    family: windows-cloud/windows-2019
+    gce_machine_type: n1-standard-2
   el7:
     roles:
-      - default
+    - default
     platform: el-7-x86_64
     box: centos/7
-    hypervisor: <%= hypervisor %>
-
+    hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
+    family: centos-cloud/centos-7
+    gce_machine_type: n1-standard-2
 CONFIG:
   log_level: verbose
   type: aio
-<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
-  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
-<% end -%>
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -179,9 +179,7 @@ describe 'Simp::BeakerHelpers' do
     it 'extracts info from PUPPET_INSTALL_TYPE' do
       ENV['PUPPET_INSTALL_TYPE'] = 'pe'
 
-      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
       expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('pe')
-      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
     end
 
     it 'fails when BEAKER_PUPPET_COLLECTION is invalid' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.30.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -20,7 +20,7 @@ dependencies:
         version: 4.17.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,21 +30,21 @@ dependencies:
         version: 4.17.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: beaker-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - ".fips_fixtures"
 - ".fixtures.yml"
 - ".github/workflows.local.json"
+- ".github/workflows/add_new_issue_to_triage_project.yml"
 - ".github/workflows/pr_acceptance.yml"
 - ".github/workflows/pr_glci.yml"
 - ".github/workflows/pr_glci_cleanup.yml"
@@ -224,6 +225,7 @@ files:
 - spec/acceptance/suites/windows/00_default_spec.rb
 - spec/acceptance/suites/windows/metadata.yml
 - spec/acceptance/suites/windows/nodesets/default.yml
+- spec/acceptance/suites/windows/nodesets/win2012.yml
 - spec/acceptance/suites/windows/nodesets/win2016.yml
 - spec/acceptance/suites/windows/nodesets/win2019.yml
 - spec/fixtures/inspec_profiles/CentOS-7-disa_stig
@@ -252,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP