Skip to content

Commit

Permalink
Merge pull request #752 from skyamgarp/PA-6760
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshcooper
joshcooper authored Jan 24, 2025
2 parents 01027ab + b2e73a8 commit d12b00c
Show file tree
Hide file tree
Showing 2 changed files with 173 additions and 163 deletions.
333 changes: 171 additions & 162 deletions task_spec/spec/acceptance/init_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,206 +42,215 @@ def log_output_errors(result)
# release of puppet-agent includes support for these platforms, they can be removed from this method and added to
# the logic that determines the puppet_7_version variable below.
def latest_platform_list
# %r{operatingsystem-version-architecture}
%r{osx-15-arm64}
end

it 'works with version and install tasks' do
# Specify the first released version for each target platform. When adding a new
# OS, you'll typically want to specify 'latest' to install from nightlies, since
# official packages won't be released until later. During the N+1 release, you'll
# want to change `target_platform` to be the first version (N) that added the OS.
puppet_7_version = case target_platform
when %r{debian-11-amd64}
'7.9.0'
when %r{el-9-x86_64}
'7.14.0'
when %r{fedora-36}
'7.19.0'
when %r{osx-11}
'7.7.0'
when %r{osx-12}, %r{ubuntu-22.04-amd64}
'7.18.0'
when %r{osx-13}
'7.26.0'
when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}
'7.27.0'
when %r{amazon-2023}, %r{osx-14}, %r{debian-11-aarch64}
'7.28.0'
when %r{debian-12}
'7.29.0'
when %r{el-9-ppc64le}, %r{amazon-2}, %r{fedora-40}
'7.31.0'
when %r{ubuntu-24.04}
'7.32.1'
when latest_platform_list
'latest'
else
'7.18.0'
end

# Use nightlies for unreleased platforms
case target_platform
when latest_platform_list
puppet_7_collection = 'puppet7-nightly'
puppet_8_collection = 'puppet8-nightly'
# Here we only install puppet-agent 8.x from nightlies as we don't support 7.x
# We have to consider tests to upgrade puppet 8.x to latest nightlies in future

# Install an puppet8 nightly version
results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet8-nightly',
'version' => 'latest',
'stop_service' => true })

results.each do |result|
logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}")
log_output_errors(result)
end

expect(results).to all(include('status' => 'success'))

# Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
service = run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
output = service[0]['value']['stdout']
expect(output).to match(%r{ensure\s+=> 'stopped'})

# Check for puppet-agent version installed
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['version']).to match(%r{^8\.\d+\.\d+})
end
else
# Specify the first released version for each target platform. When adding a new
# OS, you'll typically want to specify 'latest' to install from nightlies, since
# official packages won't be released until later. During the N+1 release, you'll
# want to change `target_platform` to be the first version (N) that added the OS.
puppet_7_version = case target_platform
when %r{debian-11-amd64}
'7.9.0'
when %r{el-9-x86_64}
'7.14.0'
when %r{fedora-36}
'7.19.0'
when %r{osx-11}
'7.7.0'
when %r{osx-12}, %r{ubuntu-22.04-amd64}
'7.18.0'
when %r{osx-13}
'7.26.0'
when %r{el-9-aarch64}, %r{ubuntu-22.04-aarch64}
'7.27.0'
when %r{amazon-2023}, %r{osx-14}, %r{debian-11-aarch64}
'7.28.0'
when %r{debian-12}
'7.29.0'
when %r{el-9-ppc64le}, %r{amazon-2}, %r{fedora-40}
'7.31.0'
when %r{ubuntu-24.04}
'7.32.1'
else
'7.18.0'
end

puppet_7_collection = 'puppet7'
puppet_8_collection = 'puppet8'
end

# We can only test puppet 7 -> 7 upgrades if multiple Puppet releases
# have supported a given platform. Once a platform has been supported
# by multiple Puppet releases, it can be removed from this list.
# multiple_puppet7_versions = case target_platform
# when %r{osx-12-arm}
# false
# else
# true
# end
multiple_puppet7_versions = case target_platform
when %r{el-9-ppc64le|amazon-2|ubuntu-24|fedora-40}
false
else
true
end

# extra request is needed on windows hosts
# this will fail with "execution expired"
run_task('puppet_agent::version', 'target', {}) if target_platform.include?('win')

# Test the agent isn't already installed and that the version task works
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['version']).to eq(nil)
end
# We can only test puppet 7 -> 7 upgrades if multiple Puppet releases
# have supported a given platform.
multiple_puppet7_versions = true

# Try to install an older puppet7 version
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_7_collection,
'version' => puppet_7_version,
'stop_service' => true })
# extra request is needed on windows hosts
# this will fail with "execution expired"
run_task('puppet_agent::version', 'target', {}) if target_platform.include?('win')

results.each do |result|
logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}")
log_output_errors(result)
end
# Test the agent isn't already installed and that the version task works
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['version']).to eq(nil)
end

expect(results).to all(include('status' => 'success'))
# Try to install an older puppet7 version
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_7_collection,
'version' => puppet_7_version,
'stop_service' => true })

# It installed a version older than latest puppet7
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
if puppet_7_version == 'latest'
expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
else
expect(res['value']['version']).to eq(puppet_7_version)
results.each do |result|
logger.info("Installed puppet-agent on #{result['target']}: #{result['status']}")
log_output_errors(result)
end
expect(res['value']['source']).to be
end

# Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
service = if target_platform.include?('win')
run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet', 'target')
else
run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
end
output = service[0]['value']['stdout']
expect(output).to match(%r{ensure\s+=> 'stopped'})

# Try to upgrade with no specific version given in parameter
# Expect nothing to happen and receive a message regarding this
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_7_collection })

results.each do |result|
logger.info("Ensuring installed puppet-agent on #{result['target']}: #{result['status']}")
log_output_errors(result)
end

results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['_output']).to match(%r{Version parameter not defined and agent detected. Nothing to do.})
end
expect(results).to all(include('status' => 'success'))

# Verify that the version didn't change
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
if puppet_7_version == 'latest'
expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
else
expect(res['value']['version']).to eq(puppet_7_version)
# It installed a version older than latest puppet7
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
if puppet_7_version == 'latest'
expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
else
expect(res['value']['version']).to eq(puppet_7_version)
end
expect(res['value']['source']).to be
end
expect(res['value']['source']).to be
end

# An OS needs to be supported for more than one 7.x release to test the
# upgrade from puppet_7_version to latest
if multiple_puppet7_versions
# Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
service = if target_platform.include?('win')
run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet', 'target')
else
run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
end
output = service[0]['value']['stdout']
expect(output).to match(%r{ensure\s+=> 'stopped'})

# Upgrade to latest puppet7 version
results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
# Try to upgrade with no specific version given in parameter
# Expect nothing to happen and receive a message regarding this
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection })

results.each do |result|
logger.info("Upgraded puppet-agent to latest puppet7 on #{result['target']}: #{result['status']}")
logger.info("Ensuring installed puppet-agent on #{result['target']}: #{result['status']}")
log_output_errors(result)
end

expect(results).to all(include('status' => 'success'))
results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['_output']).to match(%r{Version parameter not defined and agent detected. Nothing to do.})
end

# Verify that it upgraded
# Verify that the version didn't change
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['version']).not_to eq(puppet_7_version)
expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
if puppet_7_version == 'latest'
expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
else
expect(res['value']['version']).to eq(puppet_7_version)
end
expect(res['value']['source']).to be
end
end

# Puppet Agent can't be upgraded on Windows nodes while 'puppet agent' service or 'pxp-agent' service are running
if target_platform.include?('win')
# Try to upgrade from puppet6 to puppet7 but fail due to puppet agent service already running
results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
results.each do |res|
expect(res).to include('status' => 'failure')
expect(res['value']['_error']['msg']).to match(%r{Puppet Agent upgrade cannot be done while Puppet services are still running.})
# An OS needs to be supported for more than one 7.x release to test the
# upgrade from puppet_7_version to latest
if multiple_puppet7_versions

# Upgrade to latest puppet7 version
results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })

results.each do |result|
logger.info("Upgraded puppet-agent to latest puppet7 on #{result['target']}: #{result['status']}")
log_output_errors(result)
end

expect(results).to all(include('status' => 'success'))

# Verify that it upgraded
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
expect(res['value']['version']).not_to eq(puppet_7_version)
expect(res['value']['version']).to match(%r{^7\.\d+\.\d+})
expect(res['value']['source']).to be
end
end

# Manually stop the puppet agent service
service = run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet ensure=stopped', 'target')
output = service[0]['value']['stdout']
expect(output).to match(%r{ensure\s+=> 'stopped'})
end
# Puppet Agent can't be upgraded on Windows nodes while 'puppet agent' service or 'pxp-agent' service are running
if target_platform.include?('win')
# Try to upgrade from puppet6 to puppet7 but fail due to puppet agent service already running
results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
results.each do |res|
expect(res).to include('status' => 'failure')
expect(res['value']['_error']['msg']).to match(%r{Puppet Agent upgrade cannot be done while Puppet services are still running.})
end

# Manually stop the puppet agent service
service = run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet ensure=stopped', 'target')
output = service[0]['value']['stdout']
expect(output).to match(%r{ensure\s+=> 'stopped'})
end

# Succesfully upgrade from puppet7 to puppet8
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => 'latest' })
# Succesfully upgrade from puppet7 to puppet8
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => 'latest' })

results.each do |result|
logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
log_output_errors(result)
end
results.each do |result|
logger.info("Upgraded puppet-agent to puppet8 on #{result['target']}: #{result['status']}")
log_output_errors(result)
end

expect(results).to all(include('status' => 'success'))

# Verify that it upgraded
installed_version = nil
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
installed_version = res['value']['version']
expect(installed_version).not_to match(%r{^7\.\d+\.\d+})
expect(installed_version).to match(%r{^8\.\d+\.\d+})
expect(res['value']['source']).to be
end
expect(results).to all(include('status' => 'success'))

# Try installing the same version again
# Expect nothing to happen and receive a message regarding this
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => installed_version })
# Verify that it upgraded
installed_version = nil
results = run_task('puppet_agent::version', 'target', {})
results.each do |res|
expect(res).to include('status' => 'success')
installed_version = res['value']['version']
expect(installed_version).not_to match(%r{^7\.\d+\.\d+})
expect(installed_version).to match(%r{^8\.\d+\.\d+})
expect(res['value']['source']).to be
end

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.})
# Try installing the same version again
# Expect nothing to happen and receive a message regarding this
results = run_task('puppet_agent::install', 'target', { 'collection' => puppet_8_collection, 'version' => installed_version })

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.})
end
end
end
end
3 changes: 2 additions & 1 deletion tasks/install_shell.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ if [ -n "$PT_mac_source" ]; then
mac_source=$PT_mac_source
else
if [ "$nightly" = true ]; then
mac_source='http://nightlies.puppet.com/downloads'
mac_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads'
else
mac_source='http://downloads.puppet.com'
fi
Expand Down Expand Up @@ -254,6 +254,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
"12") platform_version="12";;
"13") platform_version="13";;
"14") platform_version="14";;
"15") platform_version="15";;
*) echo "No builds for platform: $major_version"
exit 1
;;
Expand Down

0 comments on commit d12b00c

Please sign in to comment.