WIP

Author: AriaXLi

task_spec/spec/acceptance/init_spec.rb

@@ -239,18 +239,8 @@ def latest_sources
       end
 
       # Succesfully upgrade from puppet7 to puppet8
-      # results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
-      #                                                         'version' => 'latest'}.merge(latest_sources))
-      results = run_task('puppet_agent::install', 'target', 
-        { 'collection' => 'puppet8-nightly',
-          'version' => 'latest',
-          'yum_source'     => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum',
-          'apt_source'     => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt',
-          'mac_source'     => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads',
-          'windows_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads',
-        }
-      )
-
+      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
+                                                              'version' => 'latest'}.merge(latest_sources))
       results.each do |result|
         logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
         log_output_errors(result)
@@ -272,18 +262,8 @@ def latest_sources
 
       # Try installing the same version again
       # Expect nothing to happen and receive a message regarding this
-      # results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
-      #                                                         'version' => installed_version}.merge(latest_sources))
-      results = run_task('puppet_agent::install', 'target', 
-        { 'collection' => 'puppet8-nightly',
-          'version' => installed_version,
-          'yum_source'     => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum',
-          'apt_source'     => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt',
-          'mac_source'     => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads',
-          'windows_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads',
-        }
-      )
-
+      results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
+                                                              'version' => installed_version}.merge(latest_sources))
       results.each do |res|
         expect(res).to include('status' => 'success')
         expect(res['value']['_output']).to match(%r{Puppet Agent #{installed_version} detected. Nothing to do.})