Skip to content

Commit

Permalink
(maint) Replace 'osfamily' legacy fact
Browse files Browse the repository at this point in the history
  • Loading branch information
rileynewton committed Aug 18, 2023
1 parent 829f25c commit db4e31b
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
confine(:to, :platform => ['el', 'sles'])

#Init
master_platform = fact_on(master, 'osfamily')
master_platform = fact_on(master, 'os.family')
r10k_fqp = get_r10k_fqp(master)

#Verification
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
confine(:to, :platform => ['el', 'sles'])

#Init
master_platform = fact_on(master, 'osfamily')
master_platform = fact_on(master, 'os.family')
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
r10k_fqp = get_r10k_fqp(master)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
confine(:to, :platform => ['el', 'sles'])

#Init
master_platform = fact_on(master, 'osfamily')
master_platform = fact_on(master, 'os.family')
r10k_fqp = get_r10k_fqp(master)

case master_platform
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

if ENV['GIT_PROVIDER'] == 'shellgit'
skip_test('Skipping test because removing Git from the system affects other "shellgit" tests.')
elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
elsif fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
skip_test('This version of EL is not supported by this test case!')
end

#Init
master_platform = fact_on(master, 'osfamily')
master_platform = fact_on(master, 'os.family')
master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
r10k_fqp = get_r10k_fqp(master)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

if ENV['GIT_PROVIDER'] == 'shellgit'
skip_test('Skipping test because removing Git from the system affects other "shellgit" tests.')
elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
elsif fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
skip_test('This version of EL is not supported by this test case!')
end

#Init
master_platform = fact_on(master, 'osfamily')
master_platform = fact_on(master, 'os.family')
master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
r10k_fqp = get_r10k_fqp(master)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'r10k_utils'
test_name 'CODEMGMT-86 - C59265 - Attempt to Deploy Environment to Disk with Insufficient Free Space'

if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
if fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
skip_test('This version of EL is not supported by this test case!')
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'master_manipulator'
test_name 'CODEMGMT-62 - C59239 - Single Environment with 10,000 Files'

if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
if fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
skip_test('This version of EL is not supported by this test case!')
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'master_manipulator'
test_name 'CODEMGMT-62 - C59242 - Single Environment with Large Binary Files'

if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
if fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
skip_test('This version of EL is not supported by this test case!')
end

Expand Down

0 comments on commit db4e31b

Please sign in to comment.