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

[release-2.12] ACM-14080: update retry logic on forward #1699

Conversation

openshift-cherrypick-robot
Copy link
Collaborator

This is an automated cherry-pick of #1697

/assign thibaultmg

/cherrypick release-2.11

Signed-off-by: Thibault Mange <[email protected]>
Signed-off-by: Thibault Mange <[email protected]>
@thibaultmg
Copy link
Contributor

/retest

Copy link

sonarqubecloud bot commented Dec 4, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
48.0% Coverage on New Code (required ≥ 70%)

See analysis details on SonarQube Cloud

Copy link
Contributor

@jacobbaungard jacobbaungard 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

openshift-ci bot commented Dec 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jacobbaungard, openshift-cherrypick-robot

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 label Dec 5, 2024
@jacobbaungard
Copy link
Contributor

/override ci/prow/sonarcloud
/override "SonarCloud Code Analysis"

Copy link

openshift-ci bot commented Dec 5, 2024

@jacobbaungard: Overrode contexts on behalf of jacobbaungard: SonarCloud Code Analysis, ci/prow/sonarcloud

In response to this:

/override ci/prow/sonarcloud
/override "SonarCloud Code Analysis"

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.

@thibaultmg thibaultmg merged commit e487c6d into stolostron:release-2.12 Dec 5, 2024
18 of 19 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator Author

@openshift-cherrypick-robot: #1699 failed to apply on top of branch "release-2.11":

Applying: update retry logic on forward
Using index info to reconstruct a base tree...
M	collectors/metrics/pkg/forwarder/forwarder.go
M	collectors/metrics/pkg/metricsclient/metricsclient.go
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
Auto-merging collectors/metrics/pkg/metricsclient/metricsclient.go
Auto-merging collectors/metrics/pkg/forwarder/forwarder.go
CONFLICT (content): Merge conflict in collectors/metrics/pkg/forwarder/forwarder.go
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 update retry logic on forward

In response to this:

This is an automated cherry-pick of #1697

/assign thibaultmg

/cherrypick release-2.11

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.

Copy link

openshift-ci bot commented Dec 5, 2024

@openshift-cherrypick-robot: The following test 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/test-unit 51e6c83 link unknown /test test-unit

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants