Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(maint) Merge 3.x into main #1361

Merged
merged 4 commits into from
Aug 18, 2023
Merged

(maint) Merge 3.x into main #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea4091d
(maint) Disable Single Git Source test for el-9, replace 'operatingsy…
rileynewton Aug 16, 2023
d623be1
Merge pull request #1360 from rileynewton/maint-disable-broken-el9-test
jonathannewman Aug 17, 2023
829f25c
Merge remote-tracking branch 'origin/3.x' into merge-3.x
rileynewton Aug 18, 2023
db4e31b
(maint) Replace 'osfamily' legacy fact
rileynewton Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration/tests/basic_functionality/negative/negative_bad_proxy.rb
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion integration/tests/basic_functionality/proxy_specified_in_configuration.rb
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion integration/tests/basic_functionality/proxy_with_puppetfile.rb
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb
View file
Open in desktop
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, "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)
Expand Down Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb
View file
Open in desktop
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, "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)
Expand Down Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/git_source/git_source_git.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb
View file
Open in desktop
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, "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

Expand Down
2 changes: 1 addition & 1 deletion integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb
View file
Open in desktop
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, "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

Expand Down
2 changes: 1 addition & 1 deletion integration/tests/user_scenario/basic_workflow/single_env_large_files.rb
View file
Open in desktop
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, "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

Expand Down