Skip to content

Install latest builds from internal nightlies in beaker tests #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 20, 2025
Merged

Install latest builds from internal nightlies in beaker tests #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51b8cbd
Revert "Update yum source url to the new artifactory location"
joshcooper Feb 19, 2025
1c464ae
Revert mac_source change
joshcooper Feb 19, 2025
906cc59
Install latest builds from internal nightlies in beaker tests
joshcooper Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion task_spec/spec/acceptance/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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']}")
Expand Down
4 changes: 2 additions & 2 deletions tasks/install_shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading