simp-beaker-helpers 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2df234c2357c8763e82b9cabaf6b9da39736ca7fcedc4a16dd344a993c2c2d
-  data.tar.gz: eda59ab6e07fadc67fb31b0d5d5462b89a2f4290129f46d32fda963999b5bc99
+  metadata.gz: 0e9731dc0c98a6ed7a1e7d81f1aa8cb84f2f78a0f52408462b214575e0ad648f
+  data.tar.gz: f8d4399abcd3278ae16abc4d508b2ec8921da93d9441f317726608813b2b6aaf
 SHA512:
-  metadata.gz: bbcabe0f22e139595747cde2afd378e8f7d4f35e1d4ce387fc2c09da3bc57d2099e8abfc0beb407cfff0a53aad13c4be032840d54a78f86a7c4f5f47a504628a
-  data.tar.gz: 84235e55f67ee2fefc02dce2221763e817876a22fb1bf6cfee7adfcbfd261913022a39bba804ad66643f0cc884c164f41e0ac3b239a8b339e1809c8b7e55b063
+  metadata.gz: 1d17b36761db1e16c8b3d76ee57d8c1f193f8fd5c1dbe13f824b837e297968adabba1c8ea3d12e0be86a396e6ebf3a8afc71f5ed27838bb240fdde1f4b4afd2a
+  data.tar.gz: 7ceff2ed1a04a20d1ee1ba533011345033513fe31c276f87cf1841707cbfd634bbfa3ec04b4ae8a7f27061fe3c92fe76f5fa1b17a66129bc291e64208b6633a7

data/.fixtures.yml

@@ -1,5 +1,8 @@
 ---
 fixtures:
+  # Needed for Hiera v5 to work
+  forge_modules:
+    compliance_markup: "simp/compliance_markup"
   repositories:
     stdlib: "https://github.com/simp/puppetlabs-stdlib"
 

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 1.18.0 / 2020-02-06
+* Update Windows support
+  * Add require beaker-windows and note installation of gem if missing
+  * Add geotrust global CA certificate in fix_eratta_on
+* Added convenience helper methods
+  * Add puppet_environment_path_on
+  * Add file_content_on which is multi-platform safe unlike the built-in
+    file_contents_on
+  * Add hiera_config_path_on
+  * Add get_hiera_config_on
+  * Add set_hiera_config_on
+
+### 1.17.1 / 2019-11-01
+* Only pull in the beaker rake tasks from the puppetlabs helpers
+
 ### 1.17.0 / 2019-10-22
 * Allow users to perform exclusion filters on SSG results
 * Allow users to pass Arrays of items to match for SSG results

data/Rakefile

@@ -12,10 +12,6 @@ require 'simp/rake/beaker'
 
 Simp::Rake::Beaker.new(@rakefile_dir)
 
-['spec','syntax','syntax:hiera','syntax:manifests','syntax:templates','lint','metadata'].each do |task|
-  Rake::Task[task].clear
-end
-
 CLEAN.include "#{@package}-*.gem"
 CLEAN.include 'pkg'
 CLEAN.include 'dist'

data/lib/simp/beaker_helpers.rb

@@ -19,7 +19,23 @@ module Simp::BeakerHelpers
   end
 
   def is_windows?(sut)
-    fact_on(sut, 'osfamily').casecmp?('windows')
+    is_windows = fact_on(sut, 'osfamily').casecmp?('windows')
+
+    if is_windows
+      begin
+        require 'beaker-windows'
+      rescue LoadError
+        logger.error(%{You must include 'beaker-windows' in your Gemfile for windows support on #{host}})
+        exit 1
+      end
+
+      include BeakerWindows::Path
+      include BeakerWindows::Powershell
+      include BeakerWindows::Registry
+      include BeakerWindows::WindowsFeature
+    end
+
+    return is_windows
   end
 
   # We can't cache this because it may change during a run
@@ -102,11 +118,21 @@ module Simp::BeakerHelpers
     splitchar = ':'
     splitchar = ';' if is_windows?(sut)
 
-    sut.puppet_configprint['modulepath'].split(splitchar)
+    (
+      sut.puppet_configprint['modulepath'].split(splitchar) +
+      sut.puppet_configprint['basemodulepath'].split(splitchar)
+    ).uniq
+  end
+
+  # Return the default environment path
+  def puppet_environment_path_on(sut, environment='production')
+    File.dirname(sut.puppet_configprint['manifest'])
   end
 
   # Return the path to the 'spec/fixtures' directory
   def fixtures_path
+    return @fixtures_path if @fixtures_path
+
     STDERR.puts '  ** fixtures_path' if ENV['BEAKER_helpers_verbose']
     dir = RSpec.configuration.default_path
     dir = File.join('.', 'spec') unless dir
@@ -114,7 +140,8 @@ module Simp::BeakerHelpers
     dir = File.join(File.expand_path(dir), 'fixtures')
 
     if File.directory?(dir)
-      return dir
+      @fixtures_path = dir
+      return @fixtures_path
     else
       raise("Could not find fixtures directory at '#{dir}'")
     end
@@ -122,6 +149,8 @@ module Simp::BeakerHelpers
 
   # Locates .fixture.yml in or above this directory.
   def fixtures_yml_path
+    return @fixtures_yml_path if @fixtures_yml_path
+
     STDERR.puts '  ** fixtures_yml_path' if ENV['BEAKER_helpers_verbose']
 
     if ENV['FIXTURES_YML']
@@ -144,19 +173,26 @@ module Simp::BeakerHelpers
 
     STDERR.puts "  ** fixtures_yml_path:finished (file: '#{file}')" if ENV['BEAKER_helpers_verbose']
 
-    fixtures_yml
+    @fixtures_yml_path = fixtures_yml
+
+    return @fixtures_yml_path
   end
 
 
   # returns an Array of puppet modules declared in .fixtures.yml
   def pupmods_in_fixtures_yml
+    return @pupmods_in_fixtures_yml if @pupmods_in_fixtures_yml
+
     STDERR.puts '  ** pupmods_in_fixtures_yml' if ENV['BEAKER_helpers_verbose']
     fixtures_yml = fixtures_yml_path
     data         = YAML.load_file( fixtures_yml )
     repos        = data.fetch('fixtures').fetch('repositories', {}).keys || []
     symlinks     = data.fetch('fixtures').fetch('symlinks', {}).keys     || []
     STDERR.puts '  ** pupmods_in_fixtures_yml: finished' if ENV['BEAKER_helpers_verbose']
-    (repos + symlinks)
+
+    @pupmods_in_fixtures_yml = (repos + symlinks)
+
+    return @pupmods_in_fixtures_yml
   end
 
 
@@ -587,8 +623,33 @@ module Simp::BeakerHelpers
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
     block_on(suts, :run_in_parallel => parallel) do |sut|
       if sut[:platform] =~ /windows/
-        puts "  -- SKIPPING #{sut} because it is windows"
-        # DO NOTHING
+        # Install the necessary windows certificate for testing
+        #
+        # https://petersouter.xyz/testing-windows-with-beaker-without-cygwin/
+        geotrust_global_ca = <<~EOM.freeze
+        -----BEGIN CERTIFICATE-----
+        MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+        MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+        YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+        EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+        R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+        9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+        fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+        iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+        1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+        bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+        MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+        ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+        uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+        Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+        tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+        PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+        hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+        5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+        -----END CERTIFICATE-----
+        EOM
+
+        install_cert_on_windows(sut, 'geotrustglobal', geotrust_global_ca)
       else
         linux_errata(sut)
       end
@@ -795,10 +856,61 @@ done
     end
   end
 
+  # Return the contents of a file on the remote host
+  #
+  # @param sut [Host] the host upon which to operate
+  # @param path [String] the path to the target file
+  # @param trim [Boolean] remove leading and trailing whitespace
+  #
+  # @return [String, nil] the contents of the remote file
+  def file_content_on(sut, path, trim=true)
+    file_content = nil
+
+    if file_exists_on(sut, path)
+      Dir.mktempdir do |dir|
+        scp_from(host, path, dir)
+
+        file_content = File.read(File.basename(path))
+      end
+    end
+
+    return file_content
+  end
+
+  # Retrieve the default hiera.yaml path
+  #
+  # @param sut [Host] one host to act upon
+  #
+  # @returns [Hash] path to the default environment's hiera.yaml
+  def hiera_config_path_on(sut)
+    File.join(puppet_environment_path_on(sut), 'hiera.yaml')
+  end
+
+  # Retrieve the default environment hiera.yaml
+  #
+  # @param sut [Host] one host to act upon
+  #
+  # @returns [Hash] content of the default environment's hiera.yaml
+  def get_hiera_config_on(sut)
+    file_content_on(sut, hiera_config_path_on(sut))
+  end
+
+  # Updates the default environment hiera.yaml
+  #
+  # @param sut [Host] One host to act upon
+  # @param hiera_yaml [Hash, String] The data to place into hiera.yaml
+  #
+  # @returns [void]
+  def set_hiera_config_on(sut, hiera_yaml)
+    hiera_yaml = hiera_yaml.to_yaml if hiera_yaml.is_a?(Hash)
+
+    create_remote_file(sut, hiera_config_path_on(sut), hiera_yaml)
+  end
+
   # Writes a YAML file in the Hiera :datadir of a Beaker::Host.
   #
   # @note This is useless unless Hiera is configured to use the data file.
-  #   @see `#write_hiera_config_on`
+  #   @see `#set_hiera_config_on`
   #
   # @param sut  [Array<Host>, String, Symbol] One or more hosts to act upon.
   #
@@ -844,7 +956,7 @@ done
   # Note: This may not work if you've shoved data somewhere that is not the
   # default and/or are manipulating the default hiera.yaml.
   #
-  # @param sut  [Host] One host to act upon
+  # @param sut [Host] One host to act upon
   #
   # @returns [String] Path to the Hieradata directory on the target system
   def hiera_datadir(sut)
@@ -855,7 +967,7 @@ done
       fail("No output returned from `puppet config print manifest` on #{sut}")
     end
 
-    puppet_env_path = File.dirname(sut.puppet_configprint['manifest'])
+    puppet_env_path = puppet_environment_path_on(sut)
 
     # We'll just take the first match since Hiera will find things there
     puppet_lookup_info = puppet_lookup_info.grep(/Path "/).grep(Regexp.new(puppet_env_path))

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.17.0'
+  VERSION = '1.18.0'
 end

data/lib/simp/rake/beaker.rb

@@ -2,7 +2,8 @@ require 'rake'
 require 'rake/clean'
 require 'rake/tasklib'
 require 'fileutils'
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppetlabs_spec_helper/tasks/beaker'
+require 'puppetlabs_spec_helper/tasks/fixtures'
 
 module Simp; end
 module Simp::Rake

data/simp-beaker-helpers.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.metadata = {
                  'issue_tracker' => 'https://simp-project.atlassian.net'
                }
-  s.add_runtime_dependency 'beaker'                      , '~> 4.0'
+  s.add_runtime_dependency 'beaker'                      , ['>= 4.16.0', '< 5.0.0']
   s.add_runtime_dependency 'beaker-rspec'                , '~> 6.2'
-  s.add_runtime_dependency 'beaker-puppet'               , '~> 1.0'
+  s.add_runtime_dependency 'beaker-puppet'               , ['>= 1.18.12', '< 2.0.0']
   s.add_runtime_dependency 'beaker-docker'               , '~> 0.3'
-  s.add_runtime_dependency 'beaker-vagrant'              , '~> 0.5'
+  s.add_runtime_dependency 'beaker-vagrant'              , ['0.6.4', '< 2.0.0']
   s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.9'
   s.add_runtime_dependency 'highline'                    , '~> 2.0'
   s.add_runtime_dependency 'nokogiri'                    , '~> 1.8'

data/spec/acceptance/suites/windows/00_default_spec.rb

@@ -6,54 +6,20 @@ require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
 
 require 'beaker/puppet_install_helper'
-require 'beaker-windows'
-include BeakerWindows::Path
-include BeakerWindows::Powershell
-include BeakerWindows::Registry
-include BeakerWindows::WindowsFeature
 
 unless ENV['BEAKER_provision'] == 'no'
   hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
+    unless Simp::BeakerHelpers::Snapshot.exist?(host, 'puppet_installed')
+      # Install Puppet
+      if host.is_pe?
+        install_pe
+      else
+        install_puppet
+      end
     end
   end
 end
 
-hosts.each do |host|
-  # https://petersouter.co.uk/testing-windows-puppet-with-beaker/
-  case host['platform']
-  when /windows/
-    GEOTRUST_GLOBAL_CA = <<-EOM.freeze
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
-    EOM
-    install_cert_on_windows(host, 'geotrustglobal', GEOTRUST_GLOBAL_CA)
-  end
-end
-
-
 RSpec.configure do |c|
   # ensure that environment OS is ready on each host
   fix_errata_on(hosts)
@@ -64,10 +30,11 @@ RSpec.configure do |c|
   # Configure all nodes in nodeset
   c.before :suite do
     begin
+      copy_fixture_modules_to( hosts )
+
       nonwin = hosts.dup
       nonwin.delete_if {|h| h[:platform] =~ /windows/ }
-      # Install modules and dependencies from spec/fixtures/modules
-      copy_fixture_modules_to( nonwin )
+
       begin
         server = only_host_with_role(nonwin, 'server')
       rescue ArgumentError => e
@@ -91,12 +58,61 @@ RSpec.configure do |c|
   end
 end
 
+describe 'windows' do
+
+  let(:hieradata){{
+    'test::foo' => 'test'
+  }}
+
+  let(:manifest){ 'notify { "test": message => lookup("test::foo")}' }
 
-hosts.each do |host|
-  describe 'windows hosts coexising with linux hosts' do
+  hosts.each do |host|
     context "on #{host}" do
-      it 'should have puppet installed' do
-        on(host, 'puppet --version')
+
+      let(:hiera_config){{
+        'version' => 5,
+        'hierarchy' => [
+          {
+            'name' => 'Common',
+            'path' => 'common.yaml'
+          },
+          {
+            'name' => 'SIMP Compliance Engine',
+            'lookup_key' => 'compliance_markup::enforcement'
+          }
+        ],
+        'defaults' => {
+          'data_hash' => 'yaml_data',
+          'datadir' => hiera_datadir(host)
+        }
+      }}
+
+      if Simp::BeakerHelpers::Snapshot.exist?(host, 'puppet_installed')
+        Simp::BeakerHelpers::Snapshot.restore(host, 'puppet_installed')
+      else
+        Simp::BeakerHelpers::Snapshot.save(host, 'puppet_installed')
+      end
+
+      describe 'windows hosts coexising with linux hosts' do
+        context "on #{host}" do
+          it 'should have puppet installed' do
+            on(host, 'puppet --version')
+          end
+
+          it 'should be able to set the hiera config' do
+            set_hiera_config_on(host, hiera_config)
+          end
+
+          it 'should be able to set the hieradata' do
+            set_hieradata_on(host, hieradata)
+          end
+
+          it 'should be able to run puppet' do
+            output = apply_manifest_on(host, manifest).stdout
+
+            expect(output).to include "defined 'message' as 'test'"
+          end
+        end
       end
     end
   end

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

@@ -9,28 +9,21 @@ HOSTS:
   win:
     roles:
       - windows
-      - ad
     platform: windows-server-amd64
     box: opentable/win-2012r2-standard-amd64-nocm # VBOX ONLY
     hypervisor: <%= hypervisor %>
     vagrant_memsize: 2048
     vagrant_cpus: 2
     user: vagrant
-    communicator: winrm
     is_cygwin: false
-  centos7:
+
+  el7:
     roles:
       - default
-      - client
     platform: el-7-x86_64
     box: centos/7
     hypervisor: <%= hypervisor %>
-  centos6:
-    roles:
-      - client
-    platform: el-6-x86_64
-    box: centos/6
-    hypervisor: <%= hypervisor %>
+
 CONFIG:
   log_level: verbose
   type: aio

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

@@ -0,0 +1,35 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  win:
+    roles:
+      - windows
+    platform: windows-server-amd64
+    box: gusztavvargadr/windows-server
+    box_version: 1607.0.1909
+    hypervisor: <%= hypervisor %>
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    communicator: winrm
+    is_cygwin: false
+
+  el7:
+    roles:
+      - default
+    platform: el-7-x86_64
+    box: centos/7
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>

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

@@ -0,0 +1,34 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  win:
+    roles:
+      - windows
+    platform: windows-server-amd64
+    box: gusztavvargadr/windows-server
+    hypervisor: <%= hypervisor %>
+    vagrant_memsize: 2048
+    vagrant_cpus: 2
+    user: vagrant
+    communicator: winrm
+    is_cygwin: false
+
+  el7:
+    roles:
+      - default
+    platform: el-7-x86_64
+    box: centos/7
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
+  puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.16.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +49,22 @@ dependencies:
   name: beaker-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.12
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.12
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-docker
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +83,22 @@ dependencies:
   name: beaker-vagrant
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-puppet_install_helper
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +209,8 @@ 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/win2016.yml
+- spec/acceptance/suites/windows/nodesets/win2019.yml
 - spec/lib/simp/beaker_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_acceptance.rb