Drop EoL Ubuntu code #2481
Merged
Drop EoL Ubuntu code #2481
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
ekohl
reviewed
Oct 10, 2023
There was a problem hiding this comment.
These conditions can be simplified:
spec/classes/mod/php_spec.rb
293: next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
spec/defines/vhost_spec.rb
596: if os_facts[:os]['release']['major'].to_i >= 18 && os_facts[:os]['name'] == 'Ubuntu'
This deletes Ubuntu 16 and older code. Those versions are already gone from metadata.json.
ekohl
reviewed
Oct 10, 2023
| @@ -290,9 +290,8 @@ | |||
| end | |||
|
|
|||
| # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8 | |||
| next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') || | |||
There was a problem hiding this comment.
I think this should be simplified to still test for Ubuntu, just like Debian.
There was a problem hiding this comment.
The tests were skipped for those and I updated the code below to match the Debian OS family. The logic should be the same now.
There was a problem hiding this comment.
Ah yes, I didn't read it carefully enough. Feels like we can also apply the same tricky to the Red Hat OS family below, but that can be done in another PR. Overall I think using next to skip tests below something is a poor practice. Indenting is much more reliable IMHO.
ekohl
approved these changes
Oct 10, 2023
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.
This deletes Ubuntu 16 and older code. Those versions are already gone from metadata.json.
Summary
Provide a detailed description of all the changes present in this pull request.
Additional Context
Add any additional context about the problem here.
Related Issues (if any)
Mention any related issues or pull requests.
Checklist
puppet apply)