Merge pull request #1361 from rileynewton/merge-3.x

(maint) Merge 3.x into main
puppetlabs · Aug 18, 2023 · fc02338 · fc02338
2 parents ba16888 + db4e31b
commit fc02338
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/integration/tests/basic_functionality/negative/negative_bad_proxy.rb b/integration/tests/basic_functionality/negative/negative_bad_proxy.rb
@@ -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

diff --git a/integration/tests/basic_functionality/proxy_specified_in_configuration.rb b/integration/tests/basic_functionality/proxy_specified_in_configuration.rb
@@ -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)
 

diff --git a/integration/tests/basic_functionality/proxy_with_puppetfile.rb b/integration/tests/basic_functionality/proxy_with_puppetfile.rb
@@ -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

diff --git a/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb b/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb
@@ -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, "operatingsystemmajrelease").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)
@@ -87,7 +87,7 @@
 if master_platform == 'RedHat'
   on(master, 'yum remove -y git')
 elsif master_platform == 'Debian'
-  if fact_on(master, "operatingsystemmajrelease") == '10.04'
+  if fact_on(master, "os.release.major") == '10.04'
     on(master, 'apt-get remove -y git-core')
   else
     on(master, 'apt-get remove -y git')

diff --git a/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb b/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb
@@ -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, "operatingsystemmajrelease").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)
@@ -86,7 +86,7 @@
 if master_platform == 'RedHat'
   on(master, 'yum remove -y git')
 elsif master_platform == 'Debian'
-  if fact_on(master, "operatingsystemmajrelease") == '10.04'
+  if fact_on(master, "os.release.major") == '10.04'
     on(master, 'apt-get remove -y git-core')
   else
     on(master, 'apt-get remove -y git')

diff --git a/integration/tests/git_source/git_source_git.rb b/integration/tests/git_source/git_source_git.rb
@@ -5,7 +5,7 @@
 
 confine(:to, :platform => 'el')
 
-if fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, "os.release.major").to_i < 6 || fact_on(master, "os.release.major").to_i > 8
   skip_test('This version of EL is not supported by this test case!')
 end
 

diff --git a/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb b/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb
@@ -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, "operatingsystemmajrelease").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
 

diff --git a/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb b/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb
@@ -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, "operatingsystemmajrelease").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
 

diff --git a/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb b/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb
@@ -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, "operatingsystemmajrelease").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