Use virtual Java packages on Red Hat and set java_bin#2
Merged
bastelfreak merged 4 commits intoOpenVoxProject:mainfrom Jul 19, 2025
Merged
Use virtual Java packages on Red Hat and set java_bin#2bastelfreak merged 4 commits intoOpenVoxProject:mainfrom
bastelfreak merged 4 commits intoOpenVoxProject:mainfrom
Conversation
Merged
Member
|
@ekohl Ready for rebase |
bastelfreak
reviewed
Feb 20, 2025
bastelfreak
reviewed
Feb 20, 2025
nmburgan
reviewed
Feb 20, 2025
Contributor
|
@ekohl could you please rebase this PR? |
bastelfreak
approved these changes
Jul 8, 2025
Contributor
bastelfreak
left a comment
bastelfreak
left a comment
There was a problem hiding this comment.
looks good to me, but I haven't tested it
Making it a config option allows for differentation. The comment for version 8 was outdated, since puppetserver 8 refuses to start up with Java 8.
The EnvironmentFile paths are config locations so if a user ever modified them, they're not replaced. By defining this in the service file, the packaging will update the location. The result is that even if a java location changes that a simple yum/apt upgrade will respect the new value in most situations.
This is a noop refactor, but makes the later diffs easier to read.
This uses the virtual packages jre-VERSION-headless instead of
explicitly openjdk. This allows other JREs to provide the same.
It also uses an explicit path to the JRE specific java bin. At least on
EL9 this allows the following upgrade path to work:
dnf install https://yum.puppet.com/puppet7-release-el-9.noarch.rpm
dnf install puppetserver
dnf install https://yum.puppet.com/puppet8-release-el-9.noarch.rpm
dnf upgrade puppetserver
Prior to this patch it would break, because it used /usr/bin/java which
will point to Java 8. By using /usr/lib/jvm/jre-17/bin/java we know for
sure it is Java 17.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 is puppetlabs/ezbake#627 opened against OpenVoxProject. I have only done an initial rebase without resolving all the issues.
I'll add inline notes with where we need to have further discussion.