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

Add amazon linux support to the 2.x branch #252

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Add amazon linux support to the 2.x branch #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f877a4d
Update repository owner to puppetlabs
mhashizume Feb 14, 2024
81844ee
Update branch for github workflow testing
tvpartytonight Feb 14, 2024
6c06890
[PA-6181]: Added amazon in 'if' condition, so that it does not raise …
span786 Mar 6, 2024
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 .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
runs-on: ubuntu-latest
if: github.repository_owner == 'voxpupuli'
if: github.repository_owner == 'puppetlabs'
steps:
- uses: actions/checkout@v3
- name: Install Ruby 3.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request: {}
push:
branches:
- master
- main

env:
BUNDLE_WITHOUT: release
Expand Down
4 changes: 2 additions & 2 deletions lib/beaker-puppet/install_utils/foss_utils.rb
View file
Open in desktop
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
Loading