-
-
Notifications
You must be signed in to change notification settings - Fork 101
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 support RHEL7/s390x image creation and devkit inclusion #3492
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sxa
changed the title
S390x fixes
Changes to support RHEL7/s390x image creation and devkit inclusion
Mar 26, 2024
Signed-off-by: Stewart X Addison <sxa@redhat.com>
Signed-off-by: Stewart X Addison <sxa@redhat.com>
Note that this cannot be included in #3488 because the devkits are not public (Unless we add the Fedora 19 one) This is part of adoptium/temurin-build#3700 |
Signed-off-by: Stewart X Addison <sxa@redhat.com>
Tested on RHEL8 as follows - marking ready for review. Follow on steps will be to set up a new RHEL8 build machine
|
karianna
approved these changes
Apr 3, 2024
Signed-off-by: Stewart X Addison <sxa@redhat.com>
andrew-m-leonard
approved these changes
Apr 3, 2024
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of adoptium/temurin-build#3700
This updates the s390x Dockerfile to remove the hack that was required while we were using docker-ce as the docker provider. The default
docker
package on RHEL7 means that the RHEL subscription from the host machine is automatically made available to containers running on the host, so that is simplified. NOTE: Onlybuild-marist-rhel79-s390x-2
has these changes during this prototype phase --1
still hasdocker-ce
so will be incompatible with this change and the dockerfile will no longer run.The playbook changes prevent attempts to install adoptium JDK8 or JDK20 as they do not exist on s390x.
The primary reason for these changes is to attempt to incorporate the devkits into the build. Since the RHEL7 ones cannot be public the dockerfile change in here copies from
/usr/local/devkit
on the host system. It should look something like this:And the contents of the two directories at the time of writing are populated by extracting the two files from the table below (the second of which is not publicly accessible). Note that the RH7 link is to a filename with
Centos7
in it. This is purely because the devkit has been built based on the Centos7 options as per the patch in https://github.com/adoptium/ci-jenkins-pipelines/pull/955/files#diff-160c3a9fceef67470c20f80d568a1dafd1641290063f4da4c42e3292bf1d9311- it is built from the RHEL7 RPMs as CentOS7 was not available on s390x:b490fa37af027659531b1bdfc884b25743b5934e3c57e69393215328d30b74a5
727458249f56ea73b30308993a0cf94e21c7b259f3abbbd422dd522a287d0dd8
These changes are being tested by https://ci.adoptium.net/job/rhel7_docker_image_updater which builds the new image and stores it on the machine.
I wrestled a little with the
yum
download at the end, but decided it was preferable from a security perspective to bloat the image with the prereqs for the devkit rather than have it downloaded on the host (which may not be the same version) or store it locally on the host which would be messy.Checklist