Skip to content

Commit

Permalink
Merge pull request #250 from span786/PA-6181-fix-acceptance-test-fail…
Browse files Browse the repository at this point in the history
…ure-caused-due-to-addition-of-amazon-linux-2023
  • Loading branch information
joshcooper authored Mar 7, 2024
2 parents 40c414b + d12e43c commit 63edc6d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/beaker-puppet/install_utils/foss_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ def install_puppetlabs_dev_repo(host, package_name, build_version,
repo_configs_dir = nil,
opts = options)
variant, version, arch, codename = host['platform'].to_array
if variant !~ /^(fedora|el|redhat|centos|debian|ubuntu|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
if variant !~ /^(amazon|fedora|el|redhat|centos|debian|ubuntu|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
raise "No repository installation step for #{variant} yet..."
end

Expand All @@ -1162,7 +1162,7 @@ def install_puppetlabs_dev_repo(host, package_name, build_version,
# url type
_, protocol, hostname = opts[:dev_builds_url].partition %r{.*://}
dev_builds_url = protocol + hostname
dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|redhat|centos)$/
dev_builds_url = opts[:dev_builds_url] if variant =~ /^(amazon|fedora|el|redhat|centos)$/

install_repo_configs(host, dev_builds_url, package_name,
build_version, platform_configs_dir)
Expand Down

0 comments on commit 63edc6d

Please sign in to comment.