From b5243548f38099e816c38ecb9be7c30170dd9642 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 21 Mar 2024 10:08:45 +0100 Subject: [PATCH] test upgrades on EL9 and Ubuntu 22.04 --- spec/acceptance/puppetserver_upgrade_spec.rb | 6 +++--- spec/support/acceptance/puppetserver.rb | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spec/acceptance/puppetserver_upgrade_spec.rb b/spec/acceptance/puppetserver_upgrade_spec.rb index f5a8a0d3..ab19cbf0 100644 --- a/spec/acceptance/puppetserver_upgrade_spec.rb +++ b/spec/acceptance/puppetserver_upgrade_spec.rb @@ -17,10 +17,10 @@ case ENV['BEAKER_PUPPET_COLLECTION'] when 'puppet8' from_version = '8.2.0' - to_version = '8.3.0' + to_version = '8.5.0' when 'puppet7' - from_version = '7.10.0' - to_version = '7.13.0' + from_version = '7.13.0' + to_version = '7.16.0' else raise 'Unsupported Puppet collection' end diff --git a/spec/support/acceptance/puppetserver.rb b/spec/support/acceptance/puppetserver.rb index 32030185..e9836b61 100644 --- a/spec/support/acceptance/puppetserver.rb +++ b/spec/support/acceptance/puppetserver.rb @@ -9,8 +9,7 @@ def unsupported_puppetserver end end -# These versions only have a single version (x.y.z) released so no upgrade is possible def unsupported_puppetserver_upgrade - (fact('os.family') == 'RedHat' && fact('os.release.major') == '9') || - (fact('os.name') == 'Ubuntu' && fact('os.release.major') == '22.04') + # currently none + false end