Drop EoL Debian 9 and older code #2479
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
bastelfreak
commented
Oct 10, 2023
spec/classes/mod/security_spec.rb
Outdated
| @@ -286,8 +286,7 @@ | |||
| ) | |||
| } | |||
|
|
|||
| if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') || | |||
| (facts[:os]['release']['major'].to_i < 9 && facts[:os]['name'] == 'Debian') | |||
| if (facts[:os]['release']['major'].to_i < 18 && facts[:os]['name'] == 'Ubuntu') | |||
There was a problem hiding this comment.
I will drop the Ubuntu 16 code in another PR
ekohl
reviewed
Oct 10, 2023
There was a problem hiding this comment.
Manifests look good, but should we also clean up the tests?
puppetlabs-apache/spec/acceptance/vhost_spec.rb
Lines 1224 to 1225 in 9c73e67
And since I'm too lazy to link directly:
manifests/mod/md.pp:# @note Unsupported platforms: CentOS: 6, 7; Debian: 8, 9; OracleLinux: all; RedHat: 6, 7; Scientific: all; SLES: all; Ubuntu: 14, 16, 18
manifests/mod/shib.pp:# @note Unsupported platforms: RedHat: all; CentOS: all; Scientific: all; SLES: all; Debian: 7, 8; Ubuntu: all; OracleLinux: all
manifests/mod/apreq2.pp:# @note Unsupported platforms: CentOS: all; Debian: 8; OracleLinux: all; RedHat: all; Scientific: all; SLES: all; Ubuntu: all
ekohl
reviewed
Oct 10, 2023
spec/acceptance/vhost_spec.rb
Outdated
| @@ -1221,7 +1221,7 @@ class { 'apache': } | |||
| end | |||
| end | |||
|
|
|||
| describe 'shibboleth parameters', if: (os[:family] == 'debian' && os[:release] != '7') do | |||
| describe 'shibboleth parameters', if: (os[:family] == 'debian') do | |||
| # Debian 7 is too old for ShibCompatValidUser | |||
There was a problem hiding this comment.
Suggested change
| # Debian 7 is too old for ShibCompatValidUser |
Debian 9 was already removed from metadata.json and isn't supported anymore. This PR drops some code leftovers.
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.
Debian 9 was already removed from metadata.json and isn't supported anymore. This PR drops some code leftovers.
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)