Skip to content

Commit 365dcd7

Browse files
bastelfreakehelms
authored andcommitted
Enable openvox acceptance tests
1 parent 88c8b8d commit 365dcd7

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gem 'kafo_module_lint', {"groups"=>["test"]}
1010
gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
1111
gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]}
1212
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
13-
gem 'puppet_metadata', '~> 4.0'
13+
gem 'puppet_metadata', '~> 5.3'
1414
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
15-
gem 'voxpupuli-acceptance', '~> 3.4', {"groups"=>["system_tests"]}
15+
gem 'voxpupuli-acceptance', '~> 4.1', {"groups"=>["system_tests"]}
1616
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
1717
gem 'hocon'
1818

spec/acceptance/puppetserver_upgrade_spec.rb

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,28 @@
1414
raise 'At least 256MB free memory required' if memoryfree_mb < 256
1515
end
1616

17+
# this is $implementation$majversion
1718
case ENV['BEAKER_PUPPET_COLLECTION']
1819
when 'puppet8'
1920
from_version = '8.2.0'
2021
to_version = '8.5.0'
22+
when 'openvox8'
23+
from_version = '8.8.1'
24+
to_version = '8.11.0'
2125
else
2226
raise 'Unsupported Puppet collection'
2327
end
2428

2529
case fact('os.family')
2630
when 'Debian'
27-
from_version_exact = "#{from_version}-1#{fact('os.distro.codename')}"
28-
to_version_exact = "#{to_version}-1#{fact('os.distro.codename')}"
31+
case ENV['BEAKER_PUPPET_COLLECTION']
32+
when 'puppet8'
33+
from_version_exact = "#{from_version}-1#{fact('os.distro.codename')}"
34+
to_version_exact = "#{to_version}-1#{fact('os.distro.codename')}"
35+
when 'openvox8'
36+
from_version_exact = "#{from_version}-1+#{fact('os.name').downcase}#{fact('os.release.major')}"
37+
to_version_exact = "#{to_version}-1+#{fact('os.name').downcase}#{fact('os.release.major')}"
38+
end
2939
else
3040
from_version_exact = from_version
3141
to_version_exact = to_version

spec/support/acceptance/puppetserver.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ def unsupported_puppetserver_upgrade
1414
when 'Fedora'
1515
true
1616
when 'Debian'
17-
host_inventory['facter']['os']['release']['major'] == '12'
17+
ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet8' && host_inventory['facter']['os']['release']['major'] == '12'
1818
end
1919
end

0 commit comments

Comments
 (0)