Merge pull request #493 from gimmyxd/maint/bump_agent

(maint) bump agent version in tests

Author: mihaibuzgau

acceptance/tests/test_upgrade_pc1_to_puppet5.rb

@@ -12,7 +12,7 @@
     manifest = <<-PP
 node default {
   class { puppet_agent:
-    package_version => '5.5.10',
+    package_version => '5.5.16',
     collection      => 'puppet5'
   }
 }
@@ -36,7 +36,7 @@ class { puppet_agent:
     agents_only.each do |agent|
       start_puppet_service_and_wait_for_puppet_run(agent)
       wait_for_installation_pid(agent)
-      assert_agent_version_on(agent, '5.5.10')
+      assert_agent_version_on(agent, '5.5.16')
     end
   end
 end

acceptance/tests/test_upgrade_puppet5_to_puppet6.rb

@@ -12,7 +12,7 @@
     manifest = <<-PP
 node default {
   class { puppet_agent:
-    package_version => '6.0.0',
+    package_version => '6.15.0',
     collection      => 'puppet6'
   }
 }
@@ -36,7 +36,7 @@ class { puppet_agent:
     agents_only.each do |agent|
       start_puppet_service_and_wait_for_puppet_run(agent)
       wait_for_installation_pid(agent)
-      assert_agent_version_on(agent, '6.0.0')
+      assert_agent_version_on(agent, '6.15.0')
     end
   end
 end

spec/acceptance/class_spec.rb

@@ -10,7 +10,7 @@
 
     it 'should work idempotently with no errors' do
       pp = <<-EOS
-      class { 'puppet_agent': package_version => '5.5.14', collection => 'puppet5' }
+      class { 'puppet_agent': package_version => '5.5.16', collection => 'puppet5' }
       EOS
 
       # Run it twice and test for idempotency
@@ -137,7 +137,7 @@ class { 'puppet_agent': service_names => [] }
     context 'with mcollective configured' do
       before(:all) {
         setup_puppet_on default, :mcollective => true, :agent => true
-        manifest = 'class { "puppet_agent": package_version => "5.5.14", collection => "puppet5", service_names => ["mcollective"] }'
+        manifest = 'class { "puppet_agent": package_version => "5.5.16", collection => "puppet5", service_names => ["mcollective"] }'
         pp = "file { '#{master.puppet['codedir']}/environments/production/manifests/site.pp': ensure => file, content => '#{manifest}' }"
         apply_manifest_on(master, pp, :catch_failures => true)
       }

spec/spec_helper_acceptance.rb

@@ -42,7 +42,7 @@ def install_modules_on(host)
   master['puppetservice'] = 'puppetserver'
   master['puppetserver-confdir'] = '/etc/puppetlabs/puppetserver/conf.d'
   master['type'] = 'aio'
-  install_puppet_agent_on master, {:version => ENV['PUPPET_CLIENT_VERSION'] || "5.5.10", :puppet_collection => 'puppet5'}
+  install_puppet_agent_on master, {:version => ENV['PUPPET_CLIENT_VERSION'] || "5.5.14", :puppet_collection => 'puppet5'}
 
   install_modules_on master
 
@@ -127,7 +127,7 @@ def setup_puppet_on(host, opts = {})
 
   puts "Setup aio puppet on #{host}"
   configure_type_defaults_on host
-  install_puppet_agent_on host, {:version => ENV['PUPPET_CLIENT_VERSION'] || '5.5.10', :puppet_collection => 'puppet5'}
+  install_puppet_agent_on host, {:version => ENV['PUPPET_CLIENT_VERSION'] || '5.5.14', :puppet_collection => 'puppet5'}
 
   puppet_opts = agent_opts(master.to_s)
   if host['platform'] =~ /windows/i

task_spec/spec/acceptance/init_spec.rb

@@ -29,8 +29,6 @@ def target_platform
 
   it 'works with version and install tasks' do
     puppet_5_version = case target_platform
-                       when %r{fedora-29}
-                         '5.5.10'
                        when %r{fedora-30}
                          '5.5.16'
                        when %r{fedora-31}