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

ART-11251: [4.18][konflux] update vendor to RedHat, Inc. #5668

Merged

Conversation

ashwindasr
Copy link
Contributor

Similar to #5667

@ashwindasr ashwindasr added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2024
@ashwindasr ashwindasr changed the title [4.18][konflux] update vendor to RedHat, Inc. ART-11251: [4.18][konflux] update vendor to RedHat, Inc. Nov 13, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 13, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 13, 2024

@ashwindasr: This pull request references ART-11251 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

Similar to #5667

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.

@ashwindasr
Copy link
Contributor Author

/unhold

Tested, EC error was resolved.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2024
@ashwindasr ashwindasr added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Nov 13, 2024
@ashwindasr ashwindasr added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2024
Copy link
Contributor

@joepvd joepvd 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 Nov 13, 2024
Copy link
Contributor

openshift-ci bot commented Nov 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joepvd

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 Nov 13, 2024
@ashwindasr ashwindasr removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2024
@ashwindasr
Copy link
Contributor Author

Tested, worked

@ashwindasr ashwindasr merged commit ca388e3 into openshift-eng:openshift-4.18 Nov 13, 2024
1 of 2 checks passed
@ashwindasr ashwindasr deleted the update-vendor-4.18 branch November 13, 2024 15:30
@ashwindasr
Copy link
Contributor Author

/cherry-pick openshift-4.17

@openshift-cherrypick-robot

@ashwindasr: #5668 failed to apply on top of branch "openshift-4.17":

Applying: scan-sources:noop [konflux] remove vendor override
Using index info to reconstruct a base tree...
M	images/openshift-enterprise-console.yml
M	images/openshift-enterprise-haproxy-router.yml
M	images/ose-haproxy-router-base.yml
A	images/ose-insights-runtime-exporter.yml
M	images/ose-installer-etcd-artifacts.yml
M	images/ose-tools.yml
Falling back to patching base and 3-way merge...
Auto-merging images/ose-tools.yml
Auto-merging images/ose-installer-etcd-artifacts.yml
CONFLICT (modify/delete): images/ose-insights-runtime-exporter.yml deleted in HEAD and modified in scan-sources:noop [konflux] remove vendor override. Version scan-sources:noop [konflux] remove vendor override of images/ose-insights-runtime-exporter.yml left in tree.
Auto-merging images/ose-haproxy-router-base.yml
Auto-merging images/openshift-enterprise-haproxy-router.yml
Auto-merging images/openshift-enterprise-console.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 scan-sources:noop [konflux] remove vendor override

In response to this:

/cherry-pick openshift-4.17

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.

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. 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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants