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

vendor: update c/common and buildah #24135

Merged
merged 3 commits into from
Oct 4, 2024
Merged

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Oct 2, 2024

see commits

Does this PR introduce a user-facing change?

podman build --retry and --retry-delay are now working

Includes a fix for CVE-2024-9341

Signed-off-by: Paul Holzinger <[email protected]>
@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 2, 2024
@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Oct 2, 2024
@Luap99 Luap99 added bloat_approved Approve a PR in which binary file size grows by over 50k No New Tests Allow PR to proceed without adding regression tests labels Oct 2, 2024
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

openshift-ci bot commented Oct 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, vrothberg

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

@vrothberg
Copy link
Member

Swagger barks

Luap99 added a commit to Luap99/buildah that referenced this pull request Oct 2, 2024
In podman we also run the bud tests, there I noticed a issue with the
podman skip logic as it was unable to fine the build-add-https-retry-ca
test name as it always expects quotes[1]

In general names should be human readable so add quotes and use spaces
over a dash as word separator.

[1] containers/podman#24135

Signed-off-by: Paul Holzinger <[email protected]>
Includes a fix for CVE-2024-9407

Signed-off-by: Paul Holzinger <[email protected]>
This commit was automatically cherry-picked
by buildah-vendor-treadmill v0.3
from the buildah vendor treadmill PR, containers#13808

  * Fix conflict caused by Ed's local-registry PR in buildah
  * Wire in "new" --retry and --retry-delay, these existed for longer
    but where non functional.

Signed-off-by: Ed Santiago <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>
@baude
Copy link
Member

baude commented Oct 2, 2024

i am rerunning the last machine failure ... it looked like the actual mac node had a breakdown of some sort.

@Luap99
Copy link
Member Author

Luap99 commented Oct 4, 2024

Tests are green

@baude
Copy link
Member

baude commented Oct 4, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 30a25a0 into containers:main Oct 4, 2024
82 checks passed
@Luap99 Luap99 deleted the vendor branch October 4, 2024 13:17
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. bloat_approved Approve a PR in which binary file size grows by over 50k kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. No New Tests Allow PR to proceed without adding regression tests release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants