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: podvm_binaries - Revert s390x breakage #1823

Conversation

stevenhorsman
Copy link
Member

Re-add the cross-build install (I guess specifically the arch specific gcc is the issues) so get the s390x podvm back working.

Re-add the cross-build install (I guess specifically the arch specific gcc is the issues)
so get the s390x podvm back working.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
@stevenhorsman stevenhorsman added e2e-test test_e2e_libvirt Run Libvirt e2e tests podvm Related to podvm images and removed e2e-test labels Apr 26, 2024
Copy link
Member

@beraldoleal beraldoleal left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@@ -34,6 +34,8 @@ ENV IMAGE_CHECKSUM "none"
COPY . /src

WORKDIR /src/cloud-api-adaptor/podvm
# Installs add-ons for foreign target, if required
RUN ./hack/cross-build-extras.sh
Copy link
Member

Choose a reason for hiding this comment

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

Is this also needed for Dockerfile.podvm_binaries.{fedora, rhel} ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure - #1741 has some discussion that shows that the RHEL podvm is being build for s390x, but maybe it's only built on s390x hardware itself? As discussed on slack and think we have a lot of inconsistency and tech-debt around this, but first switching to pull the binaries from a cache and then unifying on a single distro in upstream should help with that.

Copy link
Member

Choose a reason for hiding this comment

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

sounds good

@stevenhorsman stevenhorsman marked this pull request as ready for review April 26, 2024 13:44
Copy link
Member

@bpradipt bpradipt left a comment

Choose a reason for hiding this comment

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

/lgtm

@stevenhorsman stevenhorsman merged commit 22cb396 into confidential-containers:main Apr 26, 2024
41 of 42 checks passed
@stevenhorsman stevenhorsman deleted the s390x-podvm-bug-revert branch May 7, 2024 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
podvm Related to podvm images test_e2e_libvirt Run Libvirt e2e tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants