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

Changes to allow building a devkit using podman on a RHEL8 host #989

Merged
merged 3 commits into from
Apr 5, 2024

Conversation

sxa
Copy link
Member

@sxa sxa commented Apr 2, 2024

Both of these changes are based on equivalents in the build pipelines:

  • Adds UID option for podman to ensure bind mounts are writable by the jenkins user
  • Avoid docker pull command if the image name contains rhel

Copy link

github-actions bot commented Apr 2, 2024

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"

@karianna
Copy link
Contributor

karianna commented Apr 3, 2024

@sxa rebase required.

@andrew-m-leonard andrew-m-leonard self-requested a review April 3, 2024 15:40
@sxa sxa force-pushed the devkit_s390x_rhel branch 2 times, most recently from 43db106 to 4bebb5b Compare April 3, 2024 15:45
@sxa
Copy link
Member Author

sxa commented Apr 3, 2024

@sxa rebase required.

Done - that was a tricky one, but I always knew it was going to be as I'd based it off a branch for one of Andrew's PRs which has now been merged.

@sxa sxa enabled auto-merge (squash) April 3, 2024 15:53
# Perform devkit build
cd make/devkit && make TARGETS=${devkit_target} BASE_OS=${BASE_OS} BASE_OS_VERSION=${BASE_OS_VERSION}
if [ "${BASE_OS}" = "rhel" ]; then
mkdir -p ../../../build/devkit/jdk21u/build/devkit/download/rpms/s390x-linux-gnu-Centos${BASE_OS_VERSION}
Copy link
Contributor

Choose a reason for hiding this comment

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

jdk21u probably ought to be ${VERSION}

Copy link
Contributor

Choose a reason for hiding this comment

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

I actually think you are already in build/devkit/jdk21u
so you just need:

mkdir -p build/devkit/download/rpms/s390x-linux-gnu-Centos${BASE_OS_VERSION}

Copy link
Member Author

Choose a reason for hiding this comment

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

As discussed yesterday I'll leave that for now and fix it in the future - I don't want to change anything else now that it's been fully tested given we want to rely on this for the release in a couple of week's time.

pipelines/build/devkit/build_devkit.groovy Outdated Show resolved Hide resolved
pipelines/build/devkit/make_devkit.sh Show resolved Hide resolved
Signed-off-by: Stewart X Addison <[email protected]>
@sxa sxa requested a review from karianna April 5, 2024 13:11
@sxa sxa merged commit a20199e into adoptium:master Apr 5, 2024
4 checks passed
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