adoptium / infrastructure

This repo contains all information about machine maintenance.
Apache License 2.0
86 stars 102 forks source link

unixPb: Remove hyphen from Bootjdk symlinks #3773

Closed Haroon-Khel closed 2 weeks ago

Haroon-Khel commented 1 month ago

ref https://github.com/adoptium/infrastructure/issues/2912

In light of https://github.com/adoptium/infrastructure/issues/2912#issuecomment-2399887738, 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

Haroon-Khel commented 1 month ago

Ive removed the hyphen from the windows symlinks

Haroon-Khel commented 1 month ago

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, /usr/java{{ jdk }}_64, so at the moment I am not going to change that. Only linux, windows and mac have been updated in the playbooks, and the alpine and linux build containers

Haroon-Khel commented 1 month ago

Changes to the build scripts is here https://github.com/adoptium/temurin-build/pull/3992/files

Haroon-Khel commented 1 month ago

vpc https://ci.adoptium.net/job/VagrantPlaybookCheck/1984/console

Haroon-Khel commented 1 month ago

Latest vpc, without windows as that passed in the last one https://ci.adoptium.net/job/VagrantPlaybookCheck/1988/console

Haroon-Khel commented 3 weeks ago

Latest vpc, https://ci.adoptium.net/job/VagrantPlaybookCheck/1995/console. Successes on the boxes it could connect to

Haroon-Khel commented 3 weeks ago

Without the hyphens in the symlinks the upstream configure is able to find the bootjdks without a problem, see https://github.com/adoptium/infrastructure/issues/2912#issuecomment-2435792702

sxa commented 3 weeks ago

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, /usr/java{{ jdk }}_64, so at the moment I am not going to change that.

Interesting thought ... I wonder where the openjdk build process looks by default on those platforms?

karianna commented 3 weeks ago

/thaw

Haroon-Khel commented 2 weeks ago

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 https://github.com/adoptium/infrastructure/blob/822366e945b4ef1f540aca9a29180f7999cf6026/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml#L37 and https://github.com/adoptium/infrastructure/blob/822366e945b4ef1f540aca9a29180f7999cf6026/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java8/tasks/main.yml#L27

sxa commented 2 weeks ago

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 👍🏻

Haroon-Khel commented 2 weeks ago

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 :-)

Ive removed the BOOT_DIR variables from jenkins nodes (as much as I could if more are found please let me know)