-
-
Notifications
You must be signed in to change notification settings - Fork 79
Added headless jre capability #1308
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.
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
base: master
Are you sure you want to change the base?
Conversation
| @@ -1,13 +1,16 @@ | |||
| %global upstream_version 21.0.5+11 | |||
| %global upstream_version 21.0.9+10 | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be there, but api did not yield the 5+11 for me today.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems odd that this isn't already at the latest...
|
Please link the pull request to the issue as described by the guide here: Thank you! |
|
Also, the Linux installers are undergoing a rewrite where spec files are being generated on demand rather than individually maintained under the "linux_new" folder. See: I expect your changes will need to be done there. But it's nice to see how simple the spec macros are in order to add a headless package. I would add that as a comment to this PR so reviewer's can reference it. |
|
resolves #917 |
hi! yes, I noted the |
steelhead31
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is functionality we want in the temurin releases, we'll need to update the version specific templates in the linux_new folder. If we definitely want this, Im happy to do these changes on this PR ahead of the january release cycle!
Can you plsae drop how to test the j2 changes? Also There is quite a lot to decide (I had moved the "decission" non technical discussion back #917 (comment) , before I noticed this comment) I will mgrate it to j2 in menatime, as the chages are moreover identical. |
To test this I create a test jenkins job, and amend the jenkinsfile so that it doesnt push packages to artifactory.. https://ci.adoptium.net/job/build-scripts/job/release/job/sfr-build-linux-package-modular/ Once all the changes are in, Im happy to run the above job against your fork/branch, theres a few changes needed to the jenkins file.. ( https://github.com/adoptium/installer/blob/master/linux_new/Jenkinsfile ) to comment out the jfrog upload.. Line 192
Line 215
And these too.. Lines 991 - 993 Let me know if you want me to help test, the job in question is restricted in jenkins, but I've already got the above set up, would just need the changes above, and a small change in jenkins to point to your branch |
...
Yes, I will need help. I got lost already on " create a test jenkins job," :((( Will change the PR to aim the j2 files. Thanx a lot for all the hints! |
|
The JDK8 specfile templates(j2) should be here.. https://github.com/adoptium/installer/tree/master/linux_new/jre/rhel/src/main/packaging/temurin/8 If you make the template changes, I'll make the changes to the jenkinsfile on your branch for testing to build the headless packages, and then run some builds for jenkins. Are these changes just for the RHEL based RPMs, or do the SLES ones require the same changes ? |
:face_palm:
yyy. Will give you note. TYVM!
Hmm. Good question. I was not thinking about suse for now. Although they should be easily adjsuted, I would wait with it for some seen interest, or at least as another changeset. I was actually wondering why there are two sets (rhel/suse) of specfiles... Note that the change is also applicable for debian and others. But would really wait untill there is some interest (unless it is provided as feature). If SLES is not suse, please correct me :) |
| %global priority 2100 | ||
|
|
||
| # if rpmbuild will be executed as `rpmbuild -bb ...spec --without headfull ...` then headless package will be generated | ||
| %bcond_without headfull |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's headful not headfull
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanx!! Will fix in next iteration
| @@ -1,13 +1,16 @@ | |||
| %global upstream_version 21.0.5+11 | |||
| %global upstream_version 21.0.9+10 | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems odd that this isn't already at the latest...
Thats becasue I edited unused .spec. The .j2 files should be edited instead. Will do once PMC accept it (or not do, once tey decline it) |
|
@judovana this has been discussed and agreed with the PMC, if you'd like to update the specfiles in this branch, im happy to contribute the jenkins changes, and build some test packages using my test jobs in jenkins, assuming everything goes ok we can then plan implementing it :) |
@steelhead31 Ok, moved the change to j2 file. Can you please ride your magic wheels? If we would be ok with the change, will spread it to 25,26,17,11 and 8. I had added also an clumsy attempt to build jre and jre-headless in loop. WDYT? I feel slightly losst. Anything tried/advised will be highly appreciated. |
|
@judovana I'd remove the loop to build jre & jre-headless, I can handle this in the jenkinsfile for the automated production process :) .. I'll make some changes this afternoon and update you later |
|
In fact, I've already almost allowed for this in my jenkinsfile.. |
|
Cool! Sure! ty! |
This reverts commit d1c46ca.
|
Reverted. Once you are ready, please show me how the |
Thanks, I will do.. Im just evaluating where the best place to make the change is.. I suspect its actually going to be in the gradle, but once I've done a bit of investigating, I'll let you know.. Ive just contributed the change to prevent anything getting uploaded to anywhere it shouldnt, and I'll test that.. then have a look at which bit of the build needs tweaking |
linux_new/jre/rhel/src/main/packaging/temurin/21/temurin-21-jre.template.j2
Show resolved
Hide resolved
linux_new/jre/rhel/src/main/packaging/temurin/21/temurin-21-jre.template.j2
Outdated
Show resolved
Hide resolved
linux_new/jre/rhel/src/main/packaging/temurin/21/temurin-21-jre.template.j2
Outdated
Show resolved
Hide resolved
linux_new/jre/rhel/src/main/packaging/temurin/21/temurin-21-jre.template.j2
Outdated
Show resolved
Hide resolved
Co-authored-by: Martijn Verburg <martijnverburg@gmail.com>
|
@steelhead31 I had removed also policytool, which is gui application. It should not cause any troubles, but am looking forward for testing bits. |
|
I'll produce a couple of versions with this change, and let you have them later today |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.
If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.
If the code freeze is over you can remove this block by commenting /thaw.
|
As expected, the removed policytool, results to broken symlink of Still I think the removal is good thing, and would not take any action (eg replacement by bash script or similarly). Note that our headless packages suffers the same. Also note that poliytool is jdk8 specific. Otherwise the newest jre8 and jre8headless beahves as they should. |
Code for #917 (comment)
The PR itself is still not yet considered "ok", many testing ahead and many things to agree, but serves as example of both jre and jre-headless from one specfile:
I think many of the
Xdependencies are not necessary, as they should be autogenerated, but am not going to touch those:). Also note the name - something to confirm.I'm not sure with alsa-libs and dejavu-sans-fonts but am sure with fontconfig dependence. For alsa and dejavu, they shoudl be probably
suggestsin newer RPMs, but as also older rpm withoutsuggests/recommendsis supported, then I think it would be better to leave them out. its easy to install them on top, but hard to remove if they are hard-coded.I'm also not sure, how to init another pipeline. I would probably parametrize https://github.com/adoptium/installer/blob/master/linux/jre/redhat/src/main/packaging/build.sh to eb able to produce both headfull and
--without headfullor enhance it so it produce both right away, rather then add any duplicates. Any hints or help on the "how this should be consumed", welcomed.Also I guess I should be editing the https://github.com/adoptium/installer/tree/master/linux_new/jre/rhel/src/main/packaging and not this one.. But am not sure