:bug: improve upper constraint handling - Githubissues

metal3-io / ironic-image

Container image to run OpenStack Ironic as part of Metal³

Apache License 2.0

58 stars 118 forks source link

:bug: improve upper constraint handling #584

Closed Rozzii closed 3 weeks ago

Rozzii commented 3 weeks ago

This commit:

Provides a default value for the UPPER_CONSTRAINT docker file argument
Changes the prepare-image.sh logic to check the actual size of the upper constraint file and not the presence of it.

Background of this change is that it has been noticed that on release branches during image building the "pinned" upper constraint file is not picked up rather pulled from upstream OpenStack because of a lack of default argument value during image building.

Rozzii commented 3 weeks ago

If this gets merged I will cherry pick this to other branches.

Rozzii commented 3 weeks ago

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

Rozzii commented 3 weeks ago

/cc @elfosardo

tuminoid commented 3 weeks ago

/cherry-pick release-26.0

metal3-io-bot commented 3 weeks ago

@tuminoid: 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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450023351): >/cherry-pick release-26.0 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

tuminoid commented 3 weeks ago

/cherry-pick release-25.0

metal3-io-bot commented 3 weeks ago

@tuminoid: 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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450023969): >/cherry-pick release-25.0 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

tuminoid commented 3 weeks ago

/cherry-pick release-24.1

metal3-io-bot commented 3 weeks ago

@tuminoid: 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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450024357): >/cherry-pick release-24.1 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

tuminoid commented 3 weeks ago

/cherry-pick release-24.0

metal3-io-bot commented 3 weeks ago

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

In response to [this](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450024689): >/cherry-pick release-24.0 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

elfosardo commented 3 weeks ago

/approve

metal3-io-bot commented 3 weeks ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elfosardo

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: - ~~[OWNERS](https://github.com/metal3-io/ironic-image/blob/main/OWNERS)~~ [elfosardo] 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 commented 3 weeks ago

@tuminoid: #584 failed to apply on top of branch "release-24.0":

Applying: improve upper constraint handling
Using index info to reconstruct a base tree...
M   Dockerfile
M   prepare-image.sh
Falling back to patching base and 3-way merge...
Auto-merging prepare-image.sh
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 improve upper constraint handling
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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450024689): >/cherry-pick release-24.0 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

metal3-io-bot commented 3 weeks ago

@tuminoid: #584 failed to apply on top of branch "release-26.0":

Applying: improve upper constraint handling
Using index info to reconstruct a base tree...
M   Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 improve upper constraint handling
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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450023351): >/cherry-pick release-26.0 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

metal3-io-bot commented 3 weeks ago

@tuminoid: #584 failed to apply on top of branch "release-25.0":

Applying: improve upper constraint handling
Using index info to reconstruct a base tree...
M   Dockerfile
M   prepare-image.sh
Falling back to patching base and 3-way merge...
Auto-merging prepare-image.sh
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 improve upper constraint handling
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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450023969): >/cherry-pick release-25.0 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

metal3-io-bot commented 3 weeks ago

@tuminoid: #584 failed to apply on top of branch "release-24.1":

Applying: improve upper constraint handling
Using index info to reconstruct a base tree...
M   Dockerfile
M   prepare-image.sh
Falling back to patching base and 3-way merge...
Auto-merging prepare-image.sh
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 improve upper constraint handling
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](https://github.com/metal3-io/ironic-image/pull/584#issuecomment-2450024357): >/cherry-pick release-24.1 > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

tuminoid commented 3 weeks ago

@Rozzii will make manual cherry-picks to all maintained release branches.

We also need to consider should we make patch release after fix is merged, as this might/will change the Python dependencies quite drastically. @elfosardo thoughts?