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.

Sign up for GitHub

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

Jump to bottom

🐛 Pin setuptools during image build #570

Merged
merged 1 commit into from
Sep 24, 2024
Merged

🐛 Pin setuptools during image build #570

merged 1 commit into from
Sep 24, 2024

Conversation

elfosardo
Copy link
Member

Usually the setuptools installed by the system is stable but a bit too old compared to the packages we use for ironic, so pinning a more recent version helps avoiding errors and incompatibilities.

@metal3-io-bot metal3-io-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 24, 2024
@elfosardo
Pin setuptools during image build
82692ba 
Usually the setuptools installed by the system is stable but a bit
too old compared to the packages we use for ironic, so pinning a
more recent version helps avoiding errors and incompatibilities.

Signed-off-by: Riccardo Pittau <[email protected]>
@elfosardo
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main metal3-ubuntu-e2e-integration-test-main

tuminoid
tuminoid reviewed Sep 24, 2024
View reviewed changes
Copy link
Member

@tuminoid tuminoid left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2024
@elfosardo
Copy link
Member Author

/cherry-pick release-26.0

@metal3-io-bot
Copy link
Contributor

@elfosardo: once the present PR merges, I will cherry-pick it on top of release-26.0 in a new PR and assign it to you.

In response to this:

/cherry-pick release-26.0

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.

@dtantsur
Copy link
Member

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2024
@elfosardo
Copy link
Member Author

/cherry-pick release-25.0

@metal3-io-bot
Copy link
Contributor

@elfosardo: once the present PR merges, I will cherry-pick it on top of release-25.0 in a new PR and assign it to you.

In response to this:

/cherry-pick release-25.0

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.

@elfosardo
Copy link
Member Author

/cherry-pick release-24.1

@metal3-io-bot
Copy link
Contributor

@elfosardo: once the present PR merges, I will cherry-pick it on top of release-24.1 in a new PR and assign it to you.

In response to this:

/cherry-pick release-24.1

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.

@metal3-io-bot metal3-io-bot merged commit 992a79f into metal3-io:main Sep 24, 2024
6 checks passed
@metal3-io-bot
Copy link
Contributor

@elfosardo: new pull request created: #571

In response to this:

/cherry-pick release-26.0

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.

@metal3-io-bot metal3-io-bot mentioned this pull request Sep 24, 2024
Merged
@metal3-io-bot
Copy link
Contributor

@elfosardo: #570 failed to apply on top of branch "release-25.0":

Applying: Pin setuptools during image build
Using index info to reconstruct a base tree...
M	prepare-image.sh
Falling back to patching base and 3-way merge...
Auto-merging prepare-image.sh
CONFLICT (content): Merge conflict in prepare-image.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Pin setuptools during image build
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-25.0

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.

@metal3-io-bot
Copy link
Contributor

@elfosardo: #570 failed to apply on top of branch "release-24.1":

Applying: Pin setuptools during image build
Using index info to reconstruct a base tree...
M	prepare-image.sh
Falling back to patching base and 3-way merge...
Auto-merging prepare-image.sh
CONFLICT (content): Merge conflict in prepare-image.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Pin setuptools during image build
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-24.1

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.

@elfosardo
Copy link
Member Author

I guess I'll cherry-pick this manually for 25.0 and 24.1

iurygregory pushed a commit to iurygregory/ironic-image that referenced this pull request Nov 11, 2024
@openshift-merge-bot
Merge pull request metal3-io#570 from elfosardo/ocpbugs39018
09fdf1a 
OCPBUGS-39018: Bump ironic-lib to fix utf8 decoding issue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tuminoid tuminoid tuminoid left review comments

@derekhiggins derekhiggins Awaiting requested review from derekhiggins

@dtantsur dtantsur Awaiting requested review from dtantsur

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@elfosardo @metal3-io-bot @dtantsur @tuminoid