@@ -239,8 +239,17 @@ def latest_sources
239239 end
240240
241241 # Succesfully upgrade from puppet7 to puppet8
242- results = run_task ( 'puppet_agent::install' , 'target' , { 'collection' => 'puppet8-nightly' ,
243- 'version' => 'latest' } . merge ( latest_sources ) )
242+ # results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
243+ # 'version' => 'latest'}.merge(latest_sources))
244+ results = run_task ( 'puppet_agent::install' , 'target' ,
245+ { 'collection' => 'puppet8-nightly' ,
246+ 'version' => 'latest' ,
247+ 'yum_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum' ,
248+ 'apt_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt' ,
249+ 'mac_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads' ,
250+ 'windows_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads' ,
251+ }
252+ )
244253
245254 results . each do |result |
246255 logger . info ( "Upgraded puppet-agent to puppet8 on #{ result [ 'target' ] } : #{ result [ 'status' ] } " )
@@ -263,8 +272,17 @@ def latest_sources
263272
264273 # Try installing the same version again
265274 # Expect nothing to happen and receive a message regarding this
266- results = run_task ( 'puppet_agent::install' , 'target' , { 'collection' => 'puppet8-nightly' ,
267- 'version' => installed_version } . merge ( latest_sources ) )
275+ # results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
276+ # 'version' => installed_version}.merge(latest_sources))
277+ results = run_task ( 'puppet_agent::install' , 'target' ,
278+ { 'collection' => 'puppet8-nightly' ,
279+ 'version' => installed_version ,
280+ 'yum_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum' ,
281+ 'apt_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/apt' ,
282+ 'mac_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads' ,
283+ 'windows_source' => 'https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads' ,
284+ }
285+ )
268286
269287 results . each do |res |
270288 expect ( res ) . to include ( 'status' => 'success' )
0 commit comments