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

OCPBUGS-28929: [release-4.14] Bump containerd for vulnerability fix #7981

Merged

Conversation

r4f4
Copy link
Contributor

@r4f4 r4f4 commented Feb 2, 2024

Manual cherry-pick of #7957

@r4f4
Copy link
Contributor Author

r4f4 commented Feb 2, 2024

/jira cherrypick OCPBUGS-28546

@openshift-ci-robot
Copy link
Contributor

@r4f4: Jira Issue OCPBUGS-28546 has been cloned as Jira Issue OCPBUGS-28929. Will retitle bug to link to clone.
/retitle OCPBUGS-28929: [release-4.14] Bump containerd for vulnerability fix

In response to this:

/jira cherrypick OCPBUGS-28546

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.14] Bump containerd for vulnerability fix OCPBUGS-28929: [release-4.14] Bump containerd for vulnerability fix Feb 2, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 2, 2024
@openshift-ci-robot
Copy link
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-28929, which is invalid:

  • expected dependent Jira Issue OCPBUGS-28546 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Manual cherry-pick of #7957

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

openshift-ci bot commented Feb 3, 2024

@r4f4: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-upgrade fb4d6b1 link false /test okd-scos-e2e-aws-upgrade
ci/prow/okd-scos-e2e-gcp-ovn-upgrade fb4d6b1 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-gcp fb4d6b1 link false /test okd-scos-e2e-gcp
ci/prow/okd-scos-e2e-aws-ovn fb4d6b1 link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-scos-e2e-vsphere fb4d6b1 link false /test okd-scos-e2e-vsphere
ci/prow/e2e-aws-ovn-workers-rhel8 fb4d6b1 link false /test e2e-aws-ovn-workers-rhel8
ci/prow/okd-e2e-aws-ovn fb4d6b1 link false /test okd-e2e-aws-ovn

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/test-infra repository. I understand the commands that are listed here.

Copy link
Contributor

@barbacbd barbacbd left a comment

Choose a reason for hiding this comment

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

/lgtm

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

r4f4 commented Feb 7, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 7, 2024
@openshift-ci-robot
Copy link
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-28929, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-28546 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-28546 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @gpei

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from gpei February 7, 2024 08:42
@sadasu
Copy link
Contributor

sadasu commented Feb 7, 2024

/label backport-risk-assessed

@sadasu
Copy link
Contributor

sadasu commented Feb 7, 2024

/approve

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 7, 2024
Copy link
Contributor

openshift-ci bot commented Feb 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sadasu

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2024
@gpei
Copy link
Contributor

gpei commented Feb 8, 2024

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 8, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 6ad9135 into openshift:release-4.14 Feb 8, 2024
26 of 33 checks passed
@openshift-ci-robot
Copy link
Contributor

@r4f4: Jira Issue OCPBUGS-28929: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-28929 has been moved to the MODIFIED state.

In response to this:

Manual cherry-pick of #7957

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-baremetal-installer-container-v4.14.0-202402080109.p0.g6ad9135.assembly.stream.el8 for distgit ose-baremetal-installer.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2024-02-08-100326

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2024-02-12-155721

@r4f4
Copy link
Contributor Author

r4f4 commented Feb 27, 2024

/cherry-pick release-4.13

@openshift-cherrypick-robot

@r4f4: #7981 failed to apply on top of branch "release-4.13":

Applying: OCPBUGS-27507: bump containerd for vulnerability fix
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-27507: bump containerd for vulnerability fix
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-4.13

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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants