diff --git a/task_spec/spec/acceptance/init_spec.rb b/task_spec/spec/acceptance/init_spec.rb index 15a6ec7b..409684fc 100644 --- a/task_spec/spec/acceptance/init_spec.rb +++ b/task_spec/spec/acceptance/init_spec.rb @@ -48,6 +48,16 @@ def latest_platform_list }x end + # This method lists sources to be used when installing packages that haven't been released yet (see above). + def latest_sources + { + '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', + } + end + it 'works with version and install tasks' do case target_platform when latest_platform_list @@ -57,7 +67,7 @@ def latest_platform_list # Install an puppet8 nightly version results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly', 'version' => 'latest', - 'stop_service' => true }) + 'stop_service' => true }.merge(latest_sources)) results.each do |result| logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}") diff --git a/tasks/install_shell.sh b/tasks/install_shell.sh index b750be5f..4a41fc41 100644 --- a/tasks/install_shell.sh +++ b/tasks/install_shell.sh @@ -117,7 +117,7 @@ if [ -n "$PT_yum_source" ]; then yum_source=$PT_yum_source else if [ "$nightly" = true ]; then - yum_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/yum' + yum_source='http://nightlies.puppet.com/yum' else yum_source='http://yum.puppet.com' fi @@ -137,7 +137,7 @@ if [ -n "$PT_mac_source" ]; then mac_source=$PT_mac_source else if [ "$nightly" = true ]; then - mac_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads' + mac_source='http://nightlies.puppet.com/downloads' else mac_source='http://downloads.puppet.com' fi