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

Jump to bottom

Merge branch '7.x' into 'main' #3829

Closed
wants to merge 3 commits into from
Closed

Merge branch '7.x' into 'main' #3829

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
327cbf4
(PDB-5636) add ubuntu 2204 as supported platform
jonathannewman Jun 26, 2023
bcbe0b9
Merge pull request #3827 from jonathannewman/PDB-5636/7.x/authenticat…
steveax Jun 26, 2023
327539c
Merge branch '7.x' into 'main'
jonathannewman Jun 27, 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
10 changes: 9 additions & 1 deletion acceptance/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ def is_focal()
return test_config[:os_families].has_key? 'ubuntu2004-64-1'
end

def is_jammy()
return test_config[:os_families].has_key? 'ubuntu2204-64-1'
end

def is_buster()
return test_config[:os_families].has_key? 'debian10-64-1'
end
Expand Down Expand Up @@ -340,9 +344,11 @@ def puppet_repo_version(platform_version, install_type, nightly)
# supported version of PuppetDB. Its version must be available in the
# platform version returned by puppet_repo_version above
def oldest_supported
# account for bionic/rhel8 not having build before certian versions
# account for bionic/rhel8 not having build before certain versions
if is_bullseye
'7.9.0'
elsif is_jammy
'7.13.2'
else
'7.3.1'
end
Expand Down Expand Up @@ -408,6 +414,8 @@ def get_package_version(host, version = nil)
"#{version}bionic"
elsif host['platform'].include?('ubuntu-20.04')
"#{version}focal"
elsif host['platform'].include?('ubuntu-22.04')
"#{version}jammy"
elsif host['platform'].include?('debian-10')
"#{version}buster"
elsif host['platform'].include?('debian-11')
Expand Down