adoptium / infrastructure

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

Fix gcc and adoptopenjdk_install roles for riscv64 #3635

Closed sxa closed 8 hours ago

sxa commented 4 days ago

Fixes https://github.com/adoptium/infrastructure/issues/3634 and also adjusts the adoptopenjdk_install role to install JDK17 and 21 from the normal processes now that those levels are GA on riscv64

FYI @luhenry since you added most of the adoptopenjdk_install workarounds in the past but they shouldn't be required now :-)

Checklist

Memo to self: Don't squash these commits.

luhenry commented 4 days ago

You can also clean up some of https://github.com/sxa/infrastructure/blob/riscv64_fixes/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml#L104

I would like to consider upgrading to Ubuntu 22.04 for the base image as well. AFAIK we have no downstream jobs which rely on glibc versions older 2.35.

sxa commented 22 hours ago

You can also clean up some of https://github.com/sxa/infrastructure/blob/riscv64_fixes/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml#L104

Good shout - I've removed openjdk-17-jdk in this PR now too with the latest commit.