simp-beaker-helpers 1.18.9 → 1.20.0

data/lib/simp/beaker_helpers/constants.rb

@@ -5,7 +5,7 @@ module Simp::BeakerHelpers
   #
   # This is done so that we know if some new thing that we're using breaks the
   # oldest system that we support
-  DEFAULT_PUPPET_AGENT_VERSION = '~> 5.0'
+  DEFAULT_PUPPET_AGENT_VERSION = '~> 6.0'
 
   SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
 
@@ -17,7 +17,11 @@ module Simp::BeakerHelpers
     require 'open-uri'
 
     begin
-      ONLINE = true if open('http://google.com')
+      if URI.respond_to?(:open)
+        ONLINE = true if URI.open('http://google.com')
+      else
+        ONLINE = true if open('http://google.com')
+      end
     rescue
       ONLINE = false
     end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.18.9'
+  VERSION = '1.20.0'
 end

data/spec/acceptance/nodesets/default.yml

@@ -6,28 +6,27 @@
   end
 -%>
 HOSTS:
-  server-el7:
+  el7:
     roles:
-      - server
-      - master
-      - default
       - el7
+      - master
     platform: el-7-x86_64
     box: centos/7
     hypervisor: <%= hypervisor %>
 
-  server-el6:
+  el8:
     roles:
-      - el6
-    platform: el-6-x86_64
-    box: centos/6
+      - el8
+    platform: el-8-x86_64
+    box: centos/8
     hypervisor: <%= hypervisor %>
 
-  server-el8:
+  el8-0:
     roles:
       - el8
     platform: el-8-x86_64
     box: centos/8
+    box_version: "1905.1"
     hypervisor: <%= hypervisor %>
 
 CONFIG:
@@ -37,3 +36,14 @@ CONFIG:
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/nodesets/ubuntu.yml

@@ -0,0 +1,20 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  focal:
+    platform: ubuntu-20.04-x86_64
+    box: ubuntu/focal64
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 256
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>

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/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.9
+  version: 1.20.0
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2021-01-08 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"
@@ -187,6 +188,7 @@ files:
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/ubuntu.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
@@ -219,7 +221,7 @@ licenses:
 - Apache-2.0
 metadata:
   issue_tracker: https://simp-project.atlassian.net
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +236,37 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-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/nodesets/ubuntu.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