Refactor firewalld #21124
Merged
Refactor firewalld #21124
+12
−20
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
mloviska
reviewed
Feb 6, 2025
tests/console/firewall_enabled.pm
Outdated
| record_soft_failure "boo#1144543 - Migration from SFW2 to firewalld: no firewall enabled"; | ||
| return; | ||
| } | ||
| if (is_jeos && is_vmware && (is_sle('15-SP4+') || is_leap('15.4+'))) { |
There was a problem hiding this comment.
is_jeos && (is_vmware || $the_cloud_image) as SP4 is EOL
There was a problem hiding this comment.
So cloud image comes without pre-installed firewall, hence it can be only jeos && vmware
There was a problem hiding this comment.
I think we can actually remove this if block after merging #21129 and instead not schedule the test module on vmware.
mloviska
reviewed
Feb 6, 2025
| use Utils::Architectures; | ||
|
|
||
| sub run { | ||
| my ($self) = @_; | ||
| if ($self->firewall eq 'firewalld') { | ||
| my $timeout = 30; | ||
| $timeout = 60 if is_ppc64le; | ||
| my $ret = script_run('firewall-cmd --state', timeout => $timeout); |
There was a problem hiding this comment.
Has this hide the running output before?
There was a problem hiding this comment.
AFAICS it was not being checked. Only the return code.
Simplify the code flow for firewalld and make test failures better visible by running a 'die' instead of just marking the module as failed.
|
Great PR! Please pay attention to the following items before merging: Files matching
This is an automatically generated QA checklist based on modified files. |
pdostal
approved these changes
Feb 10, 2025
linguini-dev
approved these changes
Feb 10, 2025
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.
Simplify the code flow for firewalld and make test failures better visible by running a 'die' instead of just marking the module as failed.
Verification runs