Skip to content

Commit 975b798

Browse files
committed
(MODULES-11113) Use 'latest' in nightly acceptance tests
1 parent 75fa887 commit 975b798

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

acceptance/tests/test_upgrade_puppet5_to_puppet6.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
step "Create new site.pp with upgrade manifest" do
1414
manifest = <<-PP
1515
node default {
16+
if $::osfamily =~ /^(?i:windows|solaris|aix|darwin)$/ {
17+
$_package_version = '#{latest_version}'
18+
} else {
19+
$_package_version = 'latest'
20+
}
21+
1622
class { puppet_agent:
17-
package_version => '#{latest_version}',
23+
package_version => $_package_version,
1824
apt_source => 'http://nightlies.puppet.com/apt',
1925
yum_source => 'http://nightlies.puppet.com/yum',
2026
windows_source => 'http://nightlies.puppet.com/downloads',

acceptance/tests/test_upgrade_puppet6_to_puppet7.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
step "Create new site.pp with upgrade manifest" do
1414
manifest = <<-PP
1515
node default {
16+
if $::osfamily =~ /^(?i:windows|solaris|aix|darwin)$/ {
17+
$_package_version = '#{latest_version}'
18+
} else {
19+
$_package_version = 'latest'
20+
}
21+
1622
class { puppet_agent:
17-
package_version => '#{latest_version}',
23+
package_version => $_package_version,
1824
apt_source => 'http://nightlies.puppet.com/apt',
1925
yum_source => 'http://nightlies.puppet.com/yum',
2026
windows_source => 'http://nightlies.puppet.com/downloads',

0 commit comments

Comments
 (0)