Refs #32276: Add Katello hammer plugin #936
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ehelms
changed the title
evgeni
reviewed
Apr 9, 2021
| @@ -26,7 +26,7 @@ class { 'foreman::cli': | |||
|
|
|||
| it_behaves_like 'hammer' | |||
|
|
|||
| ['discovery', 'remote_execution', 'tasks', 'templates'].each do |plugin| | |||
| ['discovery', 'remote_execution', 'tasks', 'templates', 'katello'].each do |plugin| | |||
There was a problem hiding this comment.
expected Package "tfm-rubygem-hammer_cli_foreman_katello" to be installed
you'll need to fixup the logic below to not add the foreman_ prefix and add it to the plugins here, thanks katello.
There was a problem hiding this comment.
You're missing the actual include foreman::cli::katello. I would expect that it's not packaged for Debian so add it like ansible/azure. Right now we also don't have any explicit checks for those and assume that if Puppet worked correctly, it's good enough.
ekohl
reviewed
Apr 9, 2021
spec/classes/cli_plugins_spec.rb
Outdated
Comment on lines
12
to
19
| if plugin == 'azure' | ||
| 'foreman_azure_rm' | ||
| elsif plugin == 'katello' | ||
| 'katello' | ||
| else | ||
| "foreman_#{plugin}" | ||
| end |
There was a problem hiding this comment.
Feels like a case statement is more natural
Suggested change
| if plugin == 'azure' | |
| 'foreman_azure_rm' | |
| elsif plugin == 'katello' | |
| 'katello' | |
| else | |
| "foreman_#{plugin}" | |
| end | |
| case plugin | |
| when 'azure' | |
| 'foreman_azure_rm' | |
| when 'katello' | |
| 'katello' | |
| else | |
| "foreman_#{plugin}" | |
| end |
|
|
||
| describe package(package_name) do | ||
| it { is_expected.to be_installed } | ||
| package_name = fact('os.release.major') == '7' ? "tfm-rubygem-hammer_cli_katello" : "rubygem-hammer_cli_katello" |
There was a problem hiding this comment.
Suggested change
| package_name = fact('os.release.major') == '7' ? "tfm-rubygem-hammer_cli_katello" : "rubygem-hammer_cli_katello" | |
| package_name = (fact('os.release.major') == '7' ? "tfm-" : "") + "rubygem-hammer_cli_katello" |
Or
Suggested change
| package_name = fact('os.release.major') == '7' ? "tfm-rubygem-hammer_cli_katello" : "rubygem-hammer_cli_katello" | |
| package_name = "#{fact('os.release.major') == '7' ? "tfm-" : ""}rubygem-hammer_cli_katello" |
Or, since it's already used elsewhere, define a regular variable that can also be used in the regular plugin test:
scl_prefix = fact('os.release.major') == '7' ? "tfm-" : ""
|
Some of the failures here are related to #937 |
ekohl
approved these changes
Apr 9, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding this here will allow adding to the foreman-installer similar to all other plugin hammer packages and then allows being able to drop these requirements from the katello meta RPM (https://github.com/theforeman/foreman-packaging/blob/rpm/develop/packages/katello/katello/katello.spec#L34-L36).