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

Build s390x binaries using musl libc #8070

Merged
merged 1 commit into from
Apr 25, 2024

Conversation

saschagrunert
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

Building using musl until NixOS/nixpkgs#306473 is resolved.

Which issue(s) this PR fixes:

Refers to #7911

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Using musl libc for s390x until the static glibc issue is resolved.

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Apr 24, 2024
@openshift-ci openshift-ci bot requested review from hasan4791 and klihub April 24, 2024 08:15
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2024
Building using musl until NixOS/nixpkgs#306473
is resolved.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@kannon92
Copy link
Contributor

xref: NixOS/nixpkgs#306473

@kwilczynski
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2024
Copy link
Contributor

openshift-ci bot commented Apr 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kwilczynski, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@saschagrunert
Copy link
Member Author

/override ci/prow/ci-cgroupv2-e2e
/override ci/prow/ci-rhel-critest

Copy link
Contributor

openshift-ci bot commented Apr 25, 2024

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/ci-cgroupv2-e2e, ci/prow/ci-rhel-critest

In response to this:

/override ci/prow/ci-cgroupv2-e2e
/override ci/prow/ci-rhel-critest

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/test-infra repository.

@openshift-merge-bot openshift-merge-bot bot merged commit a1e1aa4 into cri-o:main Apr 25, 2024
70 checks passed
@saschagrunert saschagrunert deleted the s390x-musl branch April 25, 2024 07:36
@saschagrunert
Copy link
Member Author

/cherry-pick release-1.29

@saschagrunert
Copy link
Member Author

/cherry-pick release-1.28

@openshift-cherrypick-robot

@saschagrunert: #8070 failed to apply on top of branch "release-1.29":

Applying: Build s390x binaries using musl libc
Using index info to reconstruct a base tree...
M	nix/derivation.nix
Falling back to patching base and 3-way merge...
Auto-merging nix/derivation.nix
CONFLICT (content): Merge conflict in nix/derivation.nix
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Build s390x binaries using musl libc
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.29

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/test-infra repository.

@openshift-cherrypick-robot

@saschagrunert: #8070 failed to apply on top of branch "release-1.28":

Applying: Build s390x binaries using musl libc
Using index info to reconstruct a base tree...
M	nix/derivation.nix
Falling back to patching base and 3-way merge...
Auto-merging nix/derivation.nix
CONFLICT (content): Merge conflict in nix/derivation.nix
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Build s390x binaries using musl libc
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.28

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/test-infra repository.

saschagrunert added a commit to saschagrunert/cri-o that referenced this pull request May 6, 2024
Manual cherry-pick of 2edec28

Refers to cri-o#8070

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert added a commit to saschagrunert/cri-o that referenced this pull request May 6, 2024
Manual cherry-pick of 2edec28

Refers to cri-o#8070

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants