simp-beaker-helpers 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c5bb0aadedabbd7c93aab3b66123af0ee0c31c20420e15d52f8e1a16b86601
-  data.tar.gz: 23d115e02eb74f7aeecda877220275d1ae43951cd6bc75d3584e6e8bc64eeab9
+  metadata.gz: 2f0c1802b035c9aab8eb25b91d2434e11d3c755be99e51fe281931e369f23cfc
+  data.tar.gz: 8453b9c5d98d067103f977f45d5e2f06f7d265c38ecbbfdab3ddbc47fbe19e95
 SHA512:
-  metadata.gz: 2c855652d1b54877ec82b9b979c2b9dec45e8ccb6e303d9375e8b8440552b6066b9009c85885c62043623408e31c7090310279bd51bba29223fdf279154b04a1
-  data.tar.gz: 9c8dd37796df29ec3e1d40b5d91459ae585b997cbffa9aaba4011069c999d65f81f91b99bec34e6956ef699c6e65905073173139a8ab35db361aab8fb223f2a1
+  metadata.gz: a39140d24b4e7fe16e62c9e7220801670349082ef539dc62eabc381fb8cc902e751c340cff05b230127b1272a35d7bc909b4eeb3af23b0264a2df1ee8d7cd7b8
+  data.tar.gz: bcff7a3c524f8f753da48848562cd6d1b9ea0994a737058cd2c846dbe2081408c807dfd14b00dea77afa8a8f720f4c2f5726a18a521f715101584b62aa7f283f

data/.gitlab-ci.yml

@@ -98,21 +98,6 @@ default:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
-  variables:
-    PUPPET_VERSION: '~> 4.10.10'
-  script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[default]
-
-default-puppet5:
-  stage: acceptance
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  variables:
-    PUPPET_VERSION: '~> 5.3'
-    BEAKER_PUPPET_COLLECTION: 'puppet5'
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[default]

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.14.2 / 2019-05-16
+* Move the minimum supported puppet version to Puppet 5 since Puppet 4 has been
+  removed from the download servers completely. Beaker may re-add support for
+  the new location so not removing the mappings at this time.
+* Fixed a bug where a hash item was incorrect and not properly passing along
+  configuration items.
+
 ### 1.14.1 / 2019-04-15
 * Handle license acceptance option needed for new versions of inspec.
 

data/lib/simp/beaker_helpers.rb

@@ -19,7 +19,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 = '1.10.4'
+  DEFAULT_PUPPET_AGENT_VERSION = '~> 5.0'
 
   # We can't cache this because it may change during a run
   def fips_enabled(sut)
@@ -889,7 +889,7 @@ done
     return result
   end
 
-  # returns hash with :puppet_install_version, :beaker_puppet_collection,
+  # returns hash with :puppet_install_version, :puppet_collection,
   # and :puppet_install_type keys determined from environment variables,
   # host settings, and/or defaults
   #
@@ -916,7 +916,7 @@ done
           raise("Error: Puppet Collection '#{puppet_collection}' must match /puppet(\\d+)/")
         end
       else
-        puppet_agent_version = DEFAULT_PUPPET_AGENT_VERSION
+        puppet_agent_version = latest_puppet_agent_version_for(DEFAULT_PUPPET_AGENT_VERSION)
       end
     end
 
@@ -925,9 +925,10 @@ done
       puppet_collection = "puppet#{base_version}" if base_version >= 5
     end
 
-    { :puppet_install_version   => puppet_agent_version,
-      :beaker_puppet_collection => puppet_collection,
-      :puppet_install_type      => ENV.fetch('PUPPET_INSTALL_TYPE', 'agent')
+    {
+      :puppet_install_version => puppet_agent_version,
+      :puppet_collection      => puppet_collection,
+      :puppet_install_type    => ENV.fetch('PUPPET_INSTALL_TYPE', 'agent')
     }
   end
 
@@ -938,7 +939,7 @@ done
 
     # In case  Beaker needs this info internally
     ENV['PUPPET_INSTALL_VERSION'] = install_info[:puppet_install_version]
-    unless install_info[:puppet_collection].nil?
+    if install_info[:puppet_collection]
       ENV['BEAKER_PUPPET_COLLECTION'] = install_info[:puppet_collection]
     end
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.14.1'
+  VERSION = '1.14.2'
 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 be < '5'
+        it 'should not be running puppet 5' do
+          expect(client_puppet_version.split('.').first).to eq '5'
         end
       end
     end

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -103,20 +103,17 @@ describe 'Simp::BeakerHelpers' do
     end
 
     it 'uses defaults when no environment variables are set' do
-      expected = {
-      :puppet_install_version   => Simp::BeakerHelpers::DEFAULT_PUPPET_AGENT_VERSION,
-      :beaker_puppet_collection => nil,
-      :puppet_install_type      => 'agent'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
+      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',
-      :beaker_puppet_collection => nil,
-      :puppet_install_type      => 'agent'
+        :puppet_install_version => '1.10.5',
+        :puppet_collection      => nil,
+        :puppet_install_type    => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -125,9 +122,9 @@ describe 'Simp::BeakerHelpers' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       ENV['PUPPET_INSTALL_VERSION']= '5.5.0'
       expected = {
-      :puppet_install_version   => '5.5.0',
-      :beaker_puppet_collection => 'puppet5',
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '5.5.0',
+        :puppet_collection        => 'puppet5',
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -137,9 +134,9 @@ describe 'Simp::BeakerHelpers' do
       ENV['PUPPET_INSTALL_VERSION']= '5.5.0'
       ENV['BEAKER_PUPPET_COLLECTION']= 'puppet6'
       expected = {
-      :puppet_install_version   => '5.5.0',
-      :beaker_puppet_collection => 'puppet5',
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '5.5.0',
+        :puppet_collection        => 'puppet5',
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -149,9 +146,9 @@ describe 'Simp::BeakerHelpers' do
       ENV['PUPPET_INSTALL_VERSION']= '5.5.0'
       @helper.host.options = {'puppet_collection' => 'puppet6'}
       expected = {
-      :puppet_install_version   => '5.5.0',
-      :beaker_puppet_collection => 'puppet5',
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '5.5.0',
+        :puppet_collection        => 'puppet5',
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -159,9 +156,9 @@ describe 'Simp::BeakerHelpers' do
     it 'extracts info from BEAKER_PUPPET_AGENT_VERSION' do
       ENV['BEAKER_PUPPET_AGENT_VERSION']= '4.10.5'
       expected = {
-      :puppet_install_version   => '1.10.5',
-      :beaker_puppet_collection => nil,
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '1.10.5',
+        :puppet_collection        => nil,
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -169,9 +166,9 @@ describe 'Simp::BeakerHelpers' do
     it 'extracts info from PUPPET_VERSION' do
       ENV['PUPPET_VERSION']= '4.10.5'
       expected = {
-      :puppet_install_version   => '1.10.5',
-      :beaker_puppet_collection => nil,
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '1.10.5',
+        :puppet_collection        => nil,
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -180,9 +177,9 @@ describe 'Simp::BeakerHelpers' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       ENV['BEAKER_PUPPET_COLLECTION']= 'puppet5'
       expected = {
-      :puppet_install_version   => '5.5.1',
-      :beaker_puppet_collection => 'puppet5',
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '5.5.1',
+        :puppet_collection        => 'puppet5',
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
@@ -191,21 +188,19 @@ describe 'Simp::BeakerHelpers' do
       allow(@helper).to receive(:`).with('gem search -ra -e puppet').and_return(gem_search_results)
       @helper.host.options = {'puppet_collection' => 'puppet5'}
       expected = {
-      :puppet_install_version   => '5.5.1',
-      :beaker_puppet_collection => 'puppet5',
-      :puppet_install_type      => 'agent'
+        :puppet_install_version   => '5.5.1',
+        :puppet_collection        => 'puppet5',
+        :puppet_install_type      => 'agent'
       }
       expect( @helper.get_puppet_install_info ).to eq expected
     end
 
     it 'extracts info from PUPPET_INSTALL_TYPE' do
       ENV['PUPPET_INSTALL_TYPE'] = 'pe'
-      expected = {
-      :puppet_install_version   => Simp::BeakerHelpers::DEFAULT_PUPPET_AGENT_VERSION,
-      :beaker_puppet_collection => nil,
-      :puppet_install_type      => 'pe'
-      }
-      expect( @helper.get_puppet_install_info ).to eq expected
+
+      expect( @helper.get_puppet_install_info[:puppet_collection] ).to eq('puppet5')
+      expect( @helper.get_puppet_install_info[:puppet_install_type] ).to eq('pe')
+      expect( @helper.get_puppet_install_info[:puppet_install_version] ).to match(/^5\./)
     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.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker