simp-beaker-helpers 1.18.8 → 1.19.4

data/spec/acceptance/suites/default/check_puppet_version_spec.rb

@@ -14,8 +14,8 @@ hosts.each do |host|
           expect(client_puppet_version.split('.').first).to eq(puppet_collection_version)
         end
       else
-        it 'should not be running puppet 5' do
-          expect(client_puppet_version.split('.').first).to eq '5'
+        it 'should be running puppet 6' do
+          expect(client_puppet_version.split('.').first).to eq '6'
         end
       end
     end

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -8,15 +8,33 @@ context 'after copy_fixture_modules_to( hosts )' do
 
   describe "fact_on(master,'root_home')" do
     it 'should not return value of `root_home`' do
-      puts fact = fact_on(master, 'root_home')
-      expect( fact ).to eq ''
+      expect(fact_on(master, 'root_home')).to eq ''
     end
   end
 
   describe "pfact_on(master,'root_home')" do
     it 'should return value of `root_home`' do
-      puts fact = pfact_on(master, 'root_home')
-      expect( fact ).to eq '/root'
+      expect(pfact_on(master, 'root_home')).to eq '/root'
+    end
+  end
+
+  describe "pfact_on(master,'os.release.major')" do
+    it 'should return the value of `os.release.major`' do
+      expect(pfact_on(master, 'os.release.major')).to match(/.+/)
+    end
+  end
+
+  describe "pfact_on(master,'os.release.foo')" do
+    it 'should not return the value of `os.release.foo`' do
+      expect(pfact_on(master, 'os.release.foo')).to eq ''
+    end
+  end
+
+  describe "pfact_on(master,'fips_enabled')" do
+    expected = (ENV['BEAKER_fips'] == 'yes')
+
+    it 'should return false' do
+      expect(pfact_on(master, 'fips_enabled')).to eq expected
     end
   end
 end

data/spec/acceptance/suites/default/install_simp_deps_repo_spec.rb

@@ -2,42 +2,36 @@ require 'spec_helper_acceptance'
 
 hosts.each do |host|
   describe '#write_hieradata_to' do
+    expect_failures = false
+    if hosts_with_role(hosts, 'el8').include?(host)
+      expect_failures = true
+    end
 
     it 'should install yum utils' do
       host.install_package('yum-utils')
     end
 
-    context 'defailt settings' do
+    context 'default settings' do
       before(:all) { install_simp_repos(host) }
 
-      it 'creates the repo' do
-        on host, 'test -f /etc/yum.repos.d/simp.repo'
-        on host, 'test -f /etc/yum.repos.d/simp_deps.repo'
-      end
-
       it 'enables the correct repos' do
-        simp6info = on(host, '/usr/bin/yum repolist -v simp | grep ^Repo-status').stdout.strip
-        expect(simp6info).to match(/.*Repo-status.*enabled.*/)
-        simp6depsinfo = on(host, 'yum repolist -v simp_deps| grep ^Repo-status').stdout.strip
-        expect(simp6depsinfo).to match(/.*Repo-status.*enabled.*/)
+        skip "#{host} is not supported yet" if expect_failures
+        on(host, 'yum -y list simp')
+        on(host, 'yum -y list postgresql96')
       end
     end
 
     context 'when passed a disabled list ' do
-      before(:all) { install_simp_repos(host, ['simp'] ) }
+      before(:all) { install_simp_repos(host, ['simp-community-simp'] ) }
 
-      it 'creates the repo' do
-        on host, 'test -f /etc/yum.repos.d/simp.repo'
-        on host, 'test -f /etc/yum.repos.d/simp_deps.repo'
+      it 'enables the correct repos' do
+        skip "#{host} is not supported yet" if expect_failures
+        on(host, 'yum -y list postgresql96')
       end
 
-      it 'enables the correct repos' do
-        simp6info = on(host, 'yum repolist -v simp | grep ^Repo-status').stdout.strip
-        expect(simp6info).to match(/.*Repo-status.*disabled.*/)
-        simp6depsinfo = on(host, 'yum repolist -v simp_deps| grep ^Repo-status').stdout.strip
-        expect(simp6depsinfo).to match(/.*Repo-status.*enabled.*/)
+      it 'disables the correct repos' do
+        on(host, 'yum -y list simp', :acceptable_exit_codes => [1])
       end
     end
-
   end
 end

data/spec/acceptance/suites/default/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/default/../../nodesets
+../../nodesets

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

@@ -31,7 +31,10 @@ ScrubFixtures.new
 ENV['BEAKER_fips'] = 'yes'
 ENV['FIXTURES_YML'] = alt_fixtures
 
+beaker_gem_options = ENV['BEAKER_GEM_OPTIONS']
+
 Bundler.with_clean_env{
+  ENV['BEAKER_GEM_OPTIONS'] = beaker_gem_options
   ENV['FIXTURES_YML'] = alt_fixtures
 
   %x{bundle exec rake spec_prep}

data/spec/acceptance/suites/fips_from_fixtures/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/fips_from_fixtures/../../nodesets
+../../nodesets

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

@@ -1,24 +1,22 @@
-# This needs to be done so that we actually bring in a collection at the start
-# of the run
-#
-# Choosing an arbitrary number in the middle of 5 so that we're not fooled by
-# edge cases
-#
-ENV['PUPPET_VERSION'] = '5.1'
-
 require 'spec_helper_acceptance'
 
-Bundler.with_clean_env{
-  %x{bundle exec rake spec_prep}
-}
+unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
+  fail('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
+end
+
+if ENV['BEAKER_PUPPET_COLLECTION']
+  target_version = ENV['BEAKER_PUPPET_COLLECTION'][/(\d+)$/,1]
+elsif ENV['PUPPET_VERSION']
+  target_version = ENV['PUPPET_VERSION'].split('.').first
+end
 
 hosts.each do |host|
   describe 'make sure puppet version is valid' do
     context "on #{host}" do
       client_puppet_version = on(host, 'puppet --version').output.strip
 
-      it "should be running puppet version #{ENV['PUPPET_VERSION']}}" do
-        expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(ENV['PUPPET_VERSION'])
+      it "should be running puppet version #{target_version}" do
+        expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)
       end
     end
   end

data/spec/acceptance/suites/snapshot/nodesets

@@ -1 +1 @@
-spec/acceptance/suites/snapshot/../../nodesets
+../../nodesets

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

@@ -10,12 +10,14 @@ HOSTS:
     roles:
       - windows
     platform: windows-server-amd64
-    box: opentable/win-2012r2-standard-amd64-nocm # VBOX ONLY
+    box: devopsgroup-io/windows_server-2012r2-standard-amd64-nocm
     hypervisor: <%= hypervisor %>
     vagrant_memsize: 2048
     vagrant_cpus: 2
     user: vagrant
     is_cygwin: false
+    ssh:
+      host_key: ssh-dss
 
   el7:
     roles:

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -103,19 +103,22 @@ describe 'Simp::BeakerHelpers' do
     end
 
     it 'uses defaults when no environment variables are set' do
-      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^5\./)
-      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet5')
-      expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('agent')
-    end
 
-    it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 4' do
-      ENV['PUPPET_INSTALL_VERSION']= '4.10.5'
-      expected = {
-        :puppet_install_version => '1.10.5',
-        :puppet_collection      => nil,
-        :puppet_install_type    => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
+      # Prevent namespace pollution
+      pipe_out,pipe_in = IO.pipe
+      fork do
+        pipe_out.close
+        require 'puppet'
+        pipe_in.write(Puppet.version)
+      end
+      pipe_in.close
+
+      expected_version = pipe_out.gets
+      expected_major_version = expected_version.split('.').first
+
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(expected_version)
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq("puppet#{expected_major_version}")
+      expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('agent')
     end
 
     it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 5' do
@@ -153,26 +156,6 @@ describe 'Simp::BeakerHelpers' do
       expect( @helper.get_puppet_install_info ).to eq expected
     end
 
-    it 'extracts info from BEAKER_PUPPET_AGENT_VERSION' do
-      ENV['BEAKER_PUPPET_AGENT_VERSION']= '4.10.5'
-      expected = {
-        :puppet_install_version   => '1.10.5',
-        :puppet_collection        => nil,
-        :puppet_install_type      => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
-    end
-
-    it 'extracts info from PUPPET_VERSION' do
-      ENV['PUPPET_VERSION']= '4.10.5'
-      expected = {
-        :puppet_install_version   => '1.10.5',
-        :puppet_collection        => nil,
-        :puppet_install_type      => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
-    end
-
     it 'extracts info from BEAKER_PUPPET_COLLECTION' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       ENV['BEAKER_PUPPET_COLLECTION']= 'puppet5'
@@ -198,9 +181,9 @@ 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('puppet5')
+      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(/^5\./)
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^6\./)
     end
 
     it 'fails when BEAKER_PUPPET_COLLECTION is invalid' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.8
+  version: 1.19.4
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -161,6 +161,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".fips_fixtures"
 - ".fixtures.yml"
 - ".gitignore"
 - ".gitlab-ci.yml"
@@ -203,7 +204,6 @@ files:
 - spec/acceptance/suites/offline/nodesets/default.yml
 - spec/acceptance/suites/puppet_collections/00_default_spec.rb
 - spec/acceptance/suites/puppet_collections/metadata.yml
-- spec/acceptance/suites/puppet_collections/nodesets/default.yml
 - spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
 - spec/acceptance/suites/snapshot/10_general_usage_spec.rb
 - spec/acceptance/suites/snapshot/nodesets
@@ -220,7 +220,7 @@ licenses:
 - Apache-2.0
 metadata:
   issue_tracker: https://simp-project.atlassian.net
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,9 +235,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files: []
+test_files:
+- spec/acceptance/nodesets/default.yml
+- spec/acceptance/suites/default/check_puppet_version_spec.rb
+- spec/acceptance/suites/default/enable_fips_spec.rb
+- spec/acceptance/suites/default/fixture_modules_spec.rb
+- spec/acceptance/suites/default/install_simp_deps_repo_spec.rb
+- spec/acceptance/suites/default/nodesets
+- spec/acceptance/suites/default/pki_tests_spec.rb
+- spec/acceptance/suites/default/set_hieradata_on_spec.rb
+- spec/acceptance/suites/default/write_hieradata_to_spec.rb
+- spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb
+- spec/acceptance/suites/fips_from_fixtures/metadata.yml
+- spec/acceptance/suites/fips_from_fixtures/nodesets
+- spec/acceptance/suites/offline/00_default_spec.rb
+- spec/acceptance/suites/offline/README
+- spec/acceptance/suites/offline/nodesets/default.yml
+- spec/acceptance/suites/puppet_collections/00_default_spec.rb
+- spec/acceptance/suites/puppet_collections/metadata.yml
+- spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb
+- spec/acceptance/suites/snapshot/10_general_usage_spec.rb
+- spec/acceptance/suites/snapshot/nodesets
+- 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

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

@@ -1,30 +0,0 @@
-<%
-  if ENV['BEAKER_HYPERVISOR']
-    hypervisor = ENV['BEAKER_HYPERVISOR']
-  else
-    hypervisor = 'vagrant'
-  end
--%>
-HOSTS:
-  server-el7:
-    roles:
-      - server
-      - default
-      - master
-      - el7
-    platform: el-7-x86_64
-    box: centos/7
-    hypervisor: <%= hypervisor %>
-
-  server-el6:
-    roles:
-      - el6
-    platform: el-6-x86_64
-    box: centos/6
-    hypervisor: <%= hypervisor %>
-
-CONFIG:
-  log_level: verbose
-  type: aio
-  puppet_collection: puppet5
-  vagrant_memsize: 256