unixPb: Remove hyphen from Bootjdk symlinks#3773
unixPb: Remove hyphen from Bootjdk symlinks#3773Haroon-Khel merged 6 commits intoadoptium:masterfrom
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
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.
|
Ive removed the hyphen from the windows symlinks |
|
Solaris has one bootjdk, /opt/csw/java/jdk1.7.0_80, so I dont think any change is required there. On AIX we use a different format, |
|
Changes to the build scripts is here https://github.com/adoptium/temurin-build/pull/3992/files |
|
Latest vpc, without windows as that passed in the last one |
|
Latest vpc, https://ci.adoptium.net/job/VagrantPlaybookCheck/1995/console. Successes on the boxes it could connect to |
|
Without the hyphens in the symlinks the upstream configure is able to find the bootjdks without a problem, see #2912 (comment) |
sxa
left a comment
sxa
left a comment
There was a problem hiding this comment.
Initial comment - we can hopefully remove a lot of these definitions in the dockerfiles (and elsewhere) since we are now using the default locations expected by the openjdk build process which means we don't have to have them explicitly specified. Having said that I could be ok with leaving them in for now and removing them in a future date
Interesting thought ... I wonder where the openjdk build process looks by default on those platforms? |
sxa
left a comment
sxa
left a comment
There was a problem hiding this comment.
Noting also that we have 50 machines in jenkins that have at least one _BOOT_DIR variable defined on them. Hopefully they can get cleared up too with these changes being made :-)
|
/thaw |
github-actions
Bot
dismissed
their stale review
Pull Request unblocked - code freeze is over.
|
Im going to hold off on the windows changes. It looks like the upstream configure looks in C:\Program Files\Java/ (/cygdrive/c/Program Files/Java) which is where we already unpack the JDK on our machines |
Confirmed that it does indeed "just work" with our current setup 👍🏻 |
Ive removed the BOOT_DIR variables from jenkins nodes (as much as I could if more are found please let me know) |
* unixPb: Remove hyphen from Bootjdk symlinks * remove hyphen from windows bootjdk symlinks * Use hyphenated path when looking for unzipped binary * Find the jdk directory using find module * Update regex for JDK path search * Revert changes on windows
3 participants
ref #2912
In light of #2912 (comment), this pr should not be merged while we have an upcoming release. And I will test the difference that this pr makes to the symlinks in our build containers by running builds in those containers