Fixes #28308 - ignore prerelease tags in dependencies #7188
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
|
Issues: #28308 |
ezr-ondrej
requested changes
Nov 19, 2019
lib/seed_helper.rb
Outdated
| @@ -169,7 +169,7 @@ def test_template_requirements(template_name, requirements) | |||
| if plugin.nil? | |||
| logger.info("Template #{template_name} requires plugin #{r['plugin']}, skipping import.") | |||
| return false | |||
| elsif r['version'] && (Gem::Version.new(plugin.version) < Gem::Version.new(r['version'])) | |||
| elsif r['version'] && (Gem::Version.new(plugin.version) < Gem::Version.new(r['version']).release) | |||
There was a problem hiding this comment.
I believe we want the opposite, ritght?
test/unit/seed_helper_test.rb
Outdated
| requirements = { | ||
| 'require' => [{ | ||
| 'plugin' => 'some_plugin', | ||
| 'version' => '2.0.1.rc2', |
There was a problem hiding this comment.
Suggested change
| 'version' => '2.0.1.rc2', | |
| 'version' => '2.0.1', |
test/unit/seed_helper_test.rb
Outdated
| 'version' => '2.0.1.rc2', | ||
| }], | ||
| } | ||
| Foreman::Plugin.expects(:find).with('some_plugin').returns(mock(:version => '2.0.1')) |
There was a problem hiding this comment.
Suggested change
| Foreman::Plugin.expects(:find).with('some_plugin').returns(mock(:version => '2.0.1')) | |
| Foreman::Plugin.expects(:find).with('some_plugin').returns(mock(:version => '2.0.1.rc2')) |
Templates with requirements specifying plugins that contains .rc in their versions are skipped. E.g. a template needs katello 3.14.0 but 3.14.0.rc1 s installed. The comparison does not work and template is ignored. We should ignore the .rc tag as 3.14.0.rc1 has all functionality already and should be only receiving bug fixes. That makes tester life easier, they don't have to hack templates in order to seed them.
|
You're of course right, I repushed the right version now. Seems it was a long day yesterday :-) |
tbrisker
reviewed
Nov 24, 2019
| @@ -169,7 +169,7 @@ def test_template_requirements(template_name, requirements) | |||
| if plugin.nil? | |||
| logger.info("Template #{template_name} requires plugin #{r['plugin']}, skipping import.") | |||
| return false | |||
| elsif r['version'] && (Gem::Version.new(plugin.version) < Gem::Version.new(r['version'])) | |||
| elsif r['version'] && (Gem::Version.new(plugin.version).release < Gem::Version.new(r['version'])) | |||
There was a problem hiding this comment.
Do we care about specifying a prerelease version in the template? because if we do this might lead to unexpected result:
[11] pry(main)> Gem::Version.new('1.2.0.rc1').release < Gem::Version.new('1.2.0.rc2')
=> falseThere was a problem hiding this comment.
I don't think we do. I don't see a template to require a RC release.
There was a problem hiding this comment.
no, let's keep it simple and only keep versioning on GA versions, technically we may want to depend on something we added only in rc, but in real world, we care about Katello 3.14, not any of it's RC.
|
1.24 - f98ccd2 |
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.
Templates with requirements specifying plugins that contains .rc in their
versions are skipped. E.g. a template needs katello 3.14.0 but 3.14.0.rc1
s installed. The comparison does not work and template is ignored.
We should ignore the .rc tag as 3.14.0.rc1 has all functionality already
and should be only receiving bug fixes. That makes tester life easier,
they don't have to hack templates in order to seed them.