Skip to content

Commit c471292

Browse files
committed
(maint) Update recently released OSes
Enable 6.x -> 6.y upgrades for osx-12-x86_64 since it's been supported for multiple 6.x releases. We can't do the same for osx-12-ARM or ubuntu-22.04-x86_64, since we don't have immediate plans to releases 6.29.0. Install 6.28.0 instead of latest/nightly for osx-12-arm and ubuntu 22.04
1 parent 6582e10 commit c471292

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

task_spec/spec/acceptance/init_spec.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,16 @@ def log_output_errors(result)
6262
'6.23.0'
6363
when %r{osx-12-x86_64}
6464
'6.27.1'
65-
when %r{osx-12-arm}
66-
'latest'
67-
when %r{ubuntu-22.04}
68-
'latest'
65+
when %r{osx-12-arm}, %r{ubuntu-22.04}
66+
'6.28.0'
6967
else
7068
'6.17.0'
7169
end
7270

7371
# platforms that only have nightly builds available. Once a platform
7472
# is released, it should be removed from this list.
7573
case target_platform
76-
when %r{ubuntu-22.04}, %r{osx-12-arm}
74+
when false
7775
puppet_6_collection = 'puppet6-nightly'
7876
puppet_7_collection = 'puppet7-nightly'
7977
else
@@ -85,7 +83,7 @@ def log_output_errors(result)
8583
# Once there a platform has been released more than once, it can be removed
8684
# from this list.
8785
multiple_puppet6_versions = case target_platform
88-
when %r{osx-12-x86_64}, %r{osx-12-arm}
86+
when %r{osx-12-arm}
8987
false
9088
when %r{ubuntu-22.04}
9189
false

0 commit comments

Comments
 (0)