Do not check license for Web&Scripting module on SLE15 #4756
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
kravciak
reviewed
Apr 3, 2018
lib/registration.pm
Outdated
| @@ -22,7 +22,7 @@ use strict; | |||
|
|
|||
| use testapi; | |||
| use utils qw(addon_decline_license assert_screen_with_soft_timeout); | |||
| use version_utils qw(is_sle sle_version_at_least is_sle12_hdd_in_upgrade); | |||
| use version_utils qw(is_sle is_sle is_sle12_hdd_in_upgrade); | |||
kravciak
reviewed
Apr 3, 2018
| push(@addons_with_license, 'sdk') unless sle_version_at_least('15'); | ||
| my @addons_with_license = qw(ha geo we live rt idu ids lgm hpcm ses); | ||
| # Development tools and Web-Scripting modules do not have license in SLE 15 | ||
| push(@addons_with_license, 'sdk') unless is_sle('15+'); |
There was a problem hiding this comment.
just for info (no change needed) - using if is_sle('<15') is sometimes safer in case you share code with opensuse because it also checks if distri=sle
kravciak
reviewed
Apr 3, 2018
lib/registration.pm
Outdated
| @@ -567,7 +567,7 @@ sub fill_in_reg_server { | |||
| sub scc_deregistration { | |||
| my (%args) = @_; | |||
| $args{version_variable} //= 'VERSION'; | |||
| if (sle_version_at_least('12-SP1', version_variable => $args{version_variable})) { | |||
| if (is_sle('12-SP1+', version_variable => $args{version_variable})) { | |||
There was a problem hiding this comment.
there is no version_variable argument in is_sle function (not implemented yet) ...this won't work :(
There was a problem hiding this comment.
Ouch, then I'll partially revert this sle_version_at_least changes. Thanks!
added 2 commits
April 3, 2018 16:51
On SLE 15, we don't have any license for Web and Scripting module, but expect it. See [poo#33943](https://progress.opensuse.org/issues/33943).
kravciak
approved these changes
Apr 3, 2018
kravciak
approved these changes
Apr 3, 2018
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.
On SLE 15, we don't have any license for Web and Scripting module, but
expect it.
See poo#33943.
Verification run.