Skip to content
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

Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64 #864

Merged
merged 5 commits into from
Dec 21, 2023

Conversation

luhenry
Copy link
Contributor

@luhenry luhenry commented Dec 20, 2023

No description provided.

The boards are just too limited at the moment.

It only targets jdk17u, jdk19u, and jdk20u for now for lack of Ubuntu
20.04 compatible builds of jdk20u (for jdk21u) and jdk21u (for jdk22).
Once we've some builds of jdk20u on Ubuntu 20.04, we can enable
jdk21u. Next we can do jdk21u for jdk22.
Copy link

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21"

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not needed for pre-JDK21 but it won't do any harm. I /think/ this will work, but I'm happy to approve and we can look at fixing up later if there are any problems.

@luhenry
Copy link
Contributor Author

luhenry commented Dec 20, 2023

@sxa how can we get it merged?

@sxa
Copy link
Member

sxa commented Dec 20, 2023

@sxa how can we get it merged?

As per the message from github it needs two reviewers. I have approved it already, but you need a second.

Copy link
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hang on - just noticed before merging that there are linter failures - those will need to be addressed first
EDIT: It's missing the comma at the end of the crossCompile line.

@@ -166,6 +166,9 @@ class Config21 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
// crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1',
Copy link
Contributor Author

@luhenry luhenry Dec 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sxa can we actually enable this one as well? (regarding the bootjdk issue)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're using 21 to bootstrap 21 on RISC-V then yeah as soon as we've got a suitable boot JDK that can be used then we can enable this.
On my "static" containerized build environemnts on my machines I've manually installed the 21.0.1+12.1 JDK and symlinked to /usr/lib/jvm/jdk-21 - we should set up the playbooks to do that.

@@ -145,6 +145,9 @@ class Config22 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
// crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sxa same as jdk21u

@sxa
Copy link
Member

sxa commented Dec 21, 2023

Yeah once we get the boot JDK in then we can definitely add the other two pipelines.
I'm not quite sure why the Test / Groovy check is failing just now though ...

EDIT: Tests are failng downloading testng from jenkins-ci.org:

   > Could not find org.testng:testng:7.2.0.
     Searched in the following locations:
       - https://repo.maven.apache.org/maven2/org/testng/testng/7.2.0/testng-7.2.0.pom
       - https://repo.jenkins-ci.org/releases/org/testng/testng/7.2.0/testng-7.2.0.pom
       - https://repo.jenkins-ci.org/public/org/testng/testng/7.2.0/testng-7.2.0.pom

Since this is nothing to do with the PR I'm going to ignore that for now - it looks like the 7.2.0 may have been removed as it does not exist in any of those repositories at the time of writing this. We'll need a separate issue to cover that.

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to merge this for 17 just now so we can get it tested in production - we can look at enabling in a subsequent PR for 21+ (Noting that JDK23 will fail until we fix the boot JDK download issue)

@sxa sxa merged commit bb28b46 into adoptium:master Dec 21, 2023
5 of 7 checks passed
luhenry added a commit to luhenry/adoptium-ci-jenkins-pipelines that referenced this pull request Feb 3, 2024
…v64 (adoptium#864)

* Use cross-compilation with Docker for riscv64

The boards are just too limited at the moment.

It only targets jdk17u, jdk19u, and jdk20u for now for lack of Ubuntu
20.04 compatible builds of jdk20u (for jdk21u) and jdk21u (for jdk22).
Once we've some builds of jdk20u on Ubuntu 20.04, we can enable
jdk21u. Next we can do jdk21u for jdk22.

* Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64

* Fix missing comma
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants