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.

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

(PA-5013) Add Red Hat 9 (ARM64) to the puppet_agent module task #675

Merged
merged 1 commit into from
Oct 16, 2023
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions task_spec/spec/acceptance/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def log_output_errors(result)
puppet_7_version = case target_platform
when %r{debian-11}
'7.9.0'
when %r{el-9}
when %r{el-9-x86_64}
'7.14.0'
when %r{fedora-36}
'7.19.0'
Expand All @@ -55,6 +55,8 @@ def log_output_errors(result)
when %r{osx-12}, %r{ubuntu-22.04}
'7.18.0'
when %r{osx-13}
'7.26.0'
when %r{el-9-aarch64}
'latest'
else
'7.18.0'
Expand All @@ -69,7 +71,7 @@ def log_output_errors(result)
# else
# end
case target_platform
when %r{osx-13}
when %r{el-9-aarch64}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed / why do you remove osx13 here? That change isn't reflected in the PR title

Copy link
Contributor Author

@skyamgarp skyamgarp Oct 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so before release we updated it to use agent from nightlies but now we have agent released like we changed the version here. I have updated it with redhat9-aarch64 now as we are yet to release it. Yes and the jira is for adding redhat9 so didn't mention it PR title.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future, it'd be good to separate out the "adding rhel9 arm" versus "dropping the special case for osx 13" into separate commits.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree.

puppet_7_collection = 'puppet7-nightly'
puppet_8_collection = 'puppet8-nightly'
else
Expand All @@ -87,7 +89,7 @@ def log_output_errors(result)
# true
# end
multiple_puppet7_versions = case target_platform
when %r{osx-13}
when %r{osx-13|el-9-aarch64}
false
else
true
Expand Down
Loading