Skip to content

Commit 57de60e

Browse files
authored
Merge pull request #408 from puppetlabs/pdksync_GH-cat-11/main/add_ubuntu_22.04_support
pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04
2 parents aa91fd4 + 88e970b commit 57de60e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
"operatingsystem": "Ubuntu",
6161
"operatingsystemrelease": [
6262
"18.04",
63-
"20.04"
63+
"20.04",
64+
"22.04"
6465
]
6566
},
6667
{

spec/acceptance/pkcs12_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
idempotent_apply(pp)
5252

53-
expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && os[:release] == '20.04') ||
53+
expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && ['20.04', '22.04'].include?(os[:release])) ||
5454
(os[:family] == 'debian' && os[:release] =~ %r{^11})
5555
[
5656
%r{Alias name: leaf cert},

spec/spec_helper_acceptance_local.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class { 'java': }
195195
@keytool_path = "C:/Program Files/Java/jdk1.#{java_major}.0_#{java_minor}/bin/"
196196
@resource_path = "['C:/Program Files/Java/jdk1.#{java_major}.0_#{java_minor}/bin/']"
197197
when 'ubuntu'
198-
@ensure_ks = 'present' if os[:release] == '20.04'
198+
@ensure_ks = 'present' if ['20.04', '22.04'].include?(os[:release])
199199
when 'debian'
200200
@ensure_ks = 'present' if os[:release].match?(%r{^11})
201201
end

0 commit comments

Comments
 (0)