Skip to content

Commit eb023df

Browse files
authored
Merge pull request #619 from joshcooper/fedora36
(FM-8983) Add Fedora 36
2 parents 6582e10 + 32308ee commit eb023df

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

task_spec/spec/acceptance/init_spec.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ 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}
65+
when %r{osx-12-arm}, %r{ubuntu-22.04}
66+
'6.28.0'
67+
when %r{fedora-36}
6868
'latest'
6969
else
7070
'6.17.0'
@@ -73,7 +73,7 @@ def log_output_errors(result)
7373
# platforms that only have nightly builds available. Once a platform
7474
# is released, it should be removed from this list.
7575
case target_platform
76-
when %r{ubuntu-22.04}, %r{osx-12-arm}
76+
when %r{fedora-36}
7777
puppet_6_collection = 'puppet6-nightly'
7878
puppet_7_collection = 'puppet7-nightly'
7979
else
@@ -85,10 +85,12 @@ def log_output_errors(result)
8585
# Once there a platform has been released more than once, it can be removed
8686
# from this list.
8787
multiple_puppet6_versions = case target_platform
88-
when %r{osx-12-x86_64}, %r{osx-12-arm}
88+
when %r{osx-12-arm}
8989
false
9090
when %r{ubuntu-22.04}
9191
false
92+
when %r{fedora-36}
93+
false
9294
else
9395
true
9496
end

0 commit comments

Comments
 (0)