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

podvm_builder: Add s390x gh install support #2137

Conversation

stevenhorsman
Copy link
Member

#2074 introduced the installation of the gh cli into the fedora podvm_builder Dockerfile using dnf. This isn't available for s390x and there isn't a released s390x version of the gh cli, so build it from source on that architecture.

@stevenhorsman stevenhorsman requested a review from a team as a code owner October 30, 2024 11:48
@stevenhorsman stevenhorsman changed the title podvm_builder: Add s390x gh install podvm_builder: Add s390x gh install support Oct 30, 2024
@stevenhorsman
Copy link
Member Author

Tested on s390x:

cloud-api-adaptor/src/cloud-api-adaptor/podvm-mkosi# make fedora-binaries-builder
...
 => => naming to docker.io/library/fedora-binaries-builder-s390x
cloud-api-adaptor/src/cloud-api-adaptor/podvm-mkosi# docker run --rm -it fedora-binaries-builder-s390x bash -c "gh version"
gh version 2.60.1-12-g14d339d9 (2024-10-30)
cloud-api-adaptor/src/cloud-api-adaptor/podvm-mkosi# make binaries
...
#10 exporting to client directory
#10 copying files 24.27MB 0.1s
#10 copying files 236.73MB 1.0s done
#10 DONE 1.0s

Tested on x86 for regression purposes:

root@sh-mkosi-build1:~/go/src/github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/podvm-mkosi# make fedora-binaries-builder
Building fedora-binaries-builder-amd64 image...
...
 => => naming to docker.io/library/fedora-binaries-builder-amd64                                                                                                         0.0s
root@sh-mkosi-build1:~/go/src/github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/podvm-mkosi# docker run --rm -it fedora-binaries-builder-amd64 bash -c "gh version"
gh version 2.60.1 (2024-10-25)
https://github.com/cli/cli/releases/tag/v2.60.1
root@sh-mkosi-build1:~/go/src/github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/podvm-mkosi# make binaries
...
#10 exporting to client directory
#10 copying files 29B
#10 copying files 209.58MB 1.6s done
#10 DONE 1.6s

the fedora podvm_builder Dockerfile using dnf. This
isn't available for s390x and there isn't a released
s390x version of the gh cli, so build it from source
on that architecture.

Signed-off-by: stevenhorsman <[email protected]>
@stevenhorsman stevenhorsman force-pushed the s390x-support-for-fedora-podvm-builder branch from 04cd305 to 55288c6 Compare October 30, 2024 12:01
Copy link
Member

@BbolroC BbolroC left a comment

Choose a reason for hiding this comment

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

LGTM as far as the CI goes green. Thanks @stevenhorsman !

@stevenhorsman stevenhorsman merged commit 896862c into confidential-containers:main Oct 30, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants