Skip to content

podvm: fix umoci checkout on s390x #634

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

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from

Conversation

ajaypvictor
Copy link

Updating umoci to checkout to a version rather than the main branch to fix an issue seen with a latest PR merge on the umoci main branch.

Fixes: https://issues.redhat.com/browse/KATA-3840

- Description of the problem which is fixed/What is the use case
Image pull on s390x is failing because of the latest umoci changes.

In osc image pull job, the umoci version used is the main branch rather than a version here – https://github.com/openshift/sandboxed-containers-operator/blob/devel/config/peerpods/podvm/libvirt-podvm-image-handler.sh#L374

This PR with umoci which merged early today is causing this failures: https://github.com/opencontainers/umoci/pull/572/files

- What I did
Checking out to a version, reference of the version taken from upstream -- https://github.com/confidential-containers/cloud-api-adaptor/blob/main/src/cloud-api-adaptor/versions.yaml#L41

- How to verify it
Manually verified it and ran a job as well

UMOCI_VERSION="v0.4.7"
git clone --depth 1 --single-branch https://github.com/opencontainers/umoci.git -b "${UMOCI_VERSION}"
Cloning into 'umoci'...
remote: Enumerating objects: 1175, done.
remote: Counting objects: 100% (1175/1175), done.
remote: Compressing objects: 100% (968/968), done.
remote: Total 1175 (delta 241), reused 512 (delta 121), pack-reused 0 (from 0)
Receiving objects: 100% (1175/1175), 2.58 MiB | 3.05 MiB/s, done.
Resolving deltas: 100% (241/241), done.
Note: switching to '17f38511d61846e2fb8ec01a1532f3ef5525e71d'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

- Description for the changelog

Updating umoci to checkout to a version rather than the main branch on s390x

Updating umoci to checkout to a version rather than the main branch to fix an issue seen with a latest PR merge on the umoci main branch.

Fixes: https://issues.redhat.com/browse/KATA-3840

Signed-off-by: Ajay Victor <[email protected]>
@openshift-ci openshift-ci bot requested review from vvoronko and wainersm May 6, 2025 07:21
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 6, 2025
Copy link

openshift-ci bot commented May 6, 2025

Hi @ajaypvictor. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@littlejawa
Copy link
Contributor

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 6, 2025
Copy link

openshift-ci bot commented May 6, 2025

@ajaypvictor: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants