(maint) Fixing test to upgrade from puppet 5 not from puppet 4

puppetlabs · May 24, 2019 · c6d903e · c6d903e
1 parent 984c215
commit c6d903e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -8,7 +8,7 @@
 
     it 'should work idempotently with no errors' do
       pp = <<-EOS
-      class { 'puppet_agent': package_version => '6.0.9' }
+      class { 'puppet_agent': package_version => '5.5.14' }
       EOS
 
       # Run it twice and test for idempotency
@@ -63,7 +63,7 @@ class { 'puppet_agent': package_version => '6.0.9' }
           wait_for_finish_on default
           case default['platform']
           when /debian|ubuntu/
-            pp = "include apt\napt::source { 'pc_repo': ensure => present, location => 'https://apt.puppet.com', repos => 'PC1' }"
+            pp = "include apt\napt::source { 'pc_repo': ensure => present, location => 'https://apt.puppet.com', repos => 'puppet5' }"
           when /fedora|el|centos/
             pp = "yumrepo { 'pc_repo': ensure => present }"
           else
@@ -173,7 +173,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 => "1.10.0", service_names => ["mcollective"] }'
+        manifest = 'class { "puppet_agent": package_version => "5.5.14", 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)
       }

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -133,7 +133,7 @@ def setup_puppet_on(host, opts = {})
 
   puts "Setup foss puppet on #{host}"
   configure_defaults_on host, 'foss'
-  install_puppet_agent_on host, :version => ENV['PUPPET_CLIENT_VERSION'] || '5.5.14'
+  install_puppet_agent_on host, {:version => ENV['PUPPET_CLIENT_VERSION'] || '5.5.10', :puppet_collection => 'puppet5'}
 
   puppet_opts = agent_opts(master.to_s)
   if host['platform'] =~ /windows/i

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
@@ -4,8 +4,8 @@
 
 RSpec.configure do |c|
   c.default_facts = {
-    :aio_agent_version           => '1.10.100',
-    :puppetversion               => nil,
+    :aio_agent_version           => '5.5.10',
+    :puppetversion               => 'puppet5',
     :lsbdistrelease              => nil,
     :is_pe                       => false,
     :platform_tag                => nil,