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

test(scorecard): retry on cryostat update conflict (backport #774) #797

Merged
merged 2 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 16, 2024

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #757


This is an automatic backport of pull request #774 done by [Mergify](https://mergify.com).

* retry on cryostat update conflict

* review

* review

(cherry picked from commit d7b0379)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
#	bundle/tests/scorecard/config.yaml
#	config/scorecard/patches/custom.config.yaml
#	internal/test/scorecard/common_utils.go
#	internal/test/scorecard/tests.go
Copy link
Contributor Author

mergify bot commented Apr 16, 2024

Cherry-pick of d7b0379 has failed:

On branch mergify/bp/cryostat3/pr-774
Your branch is up to date with 'origin/cryostat3'.

You are currently cherry-picking commit d7b0379.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml
	both modified:   bundle/tests/scorecard/config.yaml
	both modified:   config/scorecard/patches/custom.config.yaml
	both modified:   internal/test/scorecard/common_utils.go
	both modified:   internal/test/scorecard/tests.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ebaron
Copy link
Member

ebaron commented Apr 16, 2024

/build_test

@ebaron ebaron added test and removed conflicts labels Apr 16, 2024
Copy link

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit 8ed858b into cryostat3 Apr 16, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat3/pr-774 branch April 16, 2024 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants