File tree Expand file tree Collapse file tree 2 files changed +14
-8
lines changed
Expand file tree Collapse file tree 2 files changed +14
-8
lines changed Original file line number Diff line number Diff line change 2121
2222 def os_version_gte ( os , version )
2323 facts = closure_scope [ 'facts' ]
24- ( facts [ 'operatingsystem ' ] == os &&
25- Puppet ::Util ::Package . versioncmp ( facts [ 'operatingsystemmajrelease ' ] , version ) >= 0 )
24+ ( facts [ 'os' ] [ 'name '] == os &&
25+ Puppet ::Util ::Package . versioncmp ( facts [ 'os' ] [ 'release' ] [ 'major '] , version ) >= 0 )
2626 end
2727end
Original file line number Diff line number Diff line change 66 context 'on Debian 9' do
77 let ( :facts ) do
88 {
9- operatingsystem : 'Debian' ,
10- operatingsystemmajrelease : '9' ,
9+ os : {
10+ name : 'Debian' ,
11+ release : { major : '9' } ,
12+ }
1113 }
1214 end
1315
2224 context 'on Ubuntu 16.04' do
2325 let ( :facts ) do
2426 {
25- operatingsystem : 'Ubuntu' ,
26- operatingsystemmajrelease : '16.04' ,
27+ os : {
28+ name : 'Ubuntu' ,
29+ release : { major : '16.04' } ,
30+ }
2731 }
2832 end
2933
3943 context 'with invalid params' do
4044 let ( :facts ) do
4145 {
42- operatingsystem : 'Ubuntu' ,
43- operatingsystemmajrelease : '16.04' ,
46+ os : {
47+ name : 'Ubuntu' ,
48+ release : { major : '16.04' } ,
49+ }
4450 }
4551 end
4652
You can’t perform that action at this time.
0 commit comments