Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop Puppet 5 support, require >= 6.15.0 + drop pluginsync & jruby9k parameters #822

Merged
merged 5 commits into from
Feb 4, 2022
Merged

Drop Puppet 5 support, require >= 6.15.0 + drop pluginsync & jruby9k parameters #822

merged 5 commits into from
Feb 4, 2022

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Feb 3, 2022

Replaces #791.

@ekohl
Remove unused variable in params.pp
596d706 
Since e799269 it's defined in init.pp
and this default is no longer used.

Fixes: e799269
@ekohl
Drop jruby9k setting
ce3a5ba 
Starting Puppetserver 6 this is enabled by default.
@ekohl
Drop pluginsync parameter
4d279f1 
In Puppet 6 this is no longer a parameter and is always on.
@ekohl
Copy link
Member Author

ekohl commented Feb 4, 2022

Right now the failing tests:

  • Puppet 6 unit tests has a problem where Psych 4 is in the gem cache and we should purge it
  • CentOS 6 fails because it's no longer on the mirrors
  • Ubuntu fails because the lsbdistrelease fact is empty so the package version is incomplete and it can't install specific versions

These all also fail on master so I wouldn't consider them blocking right now, but I'll look into the last one.

bastelfreak
bastelfreak approved these changes Feb 4, 2022
View reviewed changes
Copy link
Member

@bastelfreak bastelfreak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested this locally, but it looks sane to me

@ekohl
Drop Puppet 5 support, require >= 6.15.0
3c729c8
@ekohl
Ensure lsb-release is present on Debian upgrade tests
69bbe88 
Facter 4 has can derive os.distro.codename from /etc/os-release but
Facter 3 needs lsb-release to be present.

It also moves the unsupported_puppetserver definition to use the release
major instead of the codename to avoid needing lsb-release.
@ekohl ekohl merged commit 69bbe88 into theforeman:master Feb 4, 2022
@ekohl ekohl deleted the drop-puppet-5 branch February 4, 2022 12:55
@ekohl ekohl mentioned this pull request Feb 4, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bastelfreak bastelfreak bastelfreak approved these changes

Assignees
No one assigned
Labels
Backwards incompatible Needs testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ekohl @bastelfreak @theforeman-bot