simp-beaker-helpers 1.19.0 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 658d1ab2cfb6ff32a020283a3a754fd3d8d4eb50cc73b73286422ea5178d48d3
-  data.tar.gz: b6a7d451700d8ac207905a20014c405f2aa06731f281720dec6a49cae5d34d33
+  metadata.gz: de616faf054a99c350f9a6241296669ce630fff0d6d622fd60c9a36ea2e2a036
+  data.tar.gz: cdbc0d01a23a79472998e87ccbd850e5a32f4e56aa04b623c1b05c050254df92
 SHA512:
-  metadata.gz: 13d63f19f099f8ca503d447cf41d150c3d74710c9ceca8a1b7c8dad655d783bd534cc117dc326235b6eb4e7ef6306b1ba6864df0c8add83eaad1737d48cdbf38
-  data.tar.gz: fe95f26b05dfaeff5be470af3c79d3cb3d7a5fc82ac7dde590f5770647d8b058774cfbc8691a00c3323c4ad85608cac7085b0764f4293e68daec6a6889669af4
+  metadata.gz: 9539f40a2fbf685e6d3a4763a69aaf5670d80e73a695eab4c029d294523612e847ca16132119a459d4381508e267642065c9f7ff99198ddabe8e4008562d7674
+  data.tar.gz: b6ed70ae00c28cfe70705cc704df6206318734ae941ef5848751caa8a37506a1e6a4432fd324a7752aae5dfdcd5fc38baa0e029ae3e17fd5cb6094649432b29e

data/.fips_fixtures

@@ -0,0 +1,8 @@
+---
+fixtures:
+  repositories:
+    fips: https://github.com/simp/pupmod-simp-fips
+    augeasproviders_core: https://github.com/simp/augeasproviders_core
+    augeasproviders_grub: https://github.com/simp/augeasproviders_grub
+    simplib: https://github.com/simp/pupmod-simp-simplib
+    stdlib: https://github.com/simp/puppetlabs-stdlib

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.19.1 / 2020-12-02
+* Fixed:
+  * Bumped the core puppet version to 6.X
+  * Fixed the file_content_on method
+  * Removed EL 6 support from the tests since the core repos are defunct
+  * Started removing some of the puppet 4 tests
+
 ### 1.19.0 / 2020-09-30
 * Fixed:
   * rsync handling has a better check to see if rsync actually works prior to

data/Gemfile

@@ -44,7 +44,7 @@ group :system_tests do
   gem 'beaker-rspec'
   gem 'beaker-windows'
   gem 'net-ssh'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.0')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 6.0')
   gem 'puppetlabs_spec_helper'
   gem 'rubocop'
   gem 'rubocop-rspec'

data/lib/simp/beaker_helpers.rb

@@ -886,10 +886,10 @@ done
     file_content = nil
 
     if file_exists_on(sut, path)
-      Dir.mktempdir do |dir|
-        scp_from(host, path, dir)
+      Dir.mktmpdir do |dir|
+        scp_from(sut, path, dir)
 
-        file_content = File.read(File.basename(path))
+        file_content = File.read(File.join(dir,File.basename(path)))
       end
     end
 
@@ -1244,7 +1244,10 @@ done
       # NOTE: This --enablerepo enables the repos for listing and is inherited
       # from YUM. This does not actually "enable" the repos, that would require
       # the "--enable" option (from yum-config-manager) :-D.
-      available_repos = on(sut, %{yum-config-manager --enablerepo="*"}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
+      #
+      # Note: Certain versions of EL8 do not dump by default and EL7 does not
+      # have the '--dump' option.
+      available_repos = on(sut, %{yum-config-manager --enablerepo="*" || yum-config-manager --enablerepo="*" --dump}).stdout.lines.grep(/\A\[(.+)\]\Z/){|x| $1}
 
       invalid_repos = (to_disable - available_repos)
 

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'
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.19.0'
+  VERSION = '1.19.1'
 end

data/spec/acceptance/nodesets/default.yml

@@ -16,13 +16,6 @@ HOSTS:
     box: centos/7
     hypervisor: <%= hypervisor %>
 
-  server-el6:
-    roles:
-      - el6
-    platform: el-6-x86_64
-    box: centos/6
-    hypervisor: <%= hypervisor %>
-
   server-el8:
     roles:
       - el8

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/lib/simp/beaker_helpers_spec.rb

@@ -103,21 +103,11 @@ 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_version] ).to match(/^6\./)
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet6')
       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
-    end
-
     it 'extracts info from PUPPET_INSTALL_VERSION for Puppet 5' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       ENV['PUPPET_INSTALL_VERSION']= '5.5.0'
@@ -153,26 +143,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 +168,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-12-10 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"