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): log workload conditions/events upon failure (backport #560) #561

Merged
merged 2 commits into from
Apr 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 26, 2023

This is an automatic backport of pull request #560 done by Mergify.
Cherry-pick of 64e99af has failed:

On branch mergify/bp/cryostat-v2.3/pr-560
Your branch is up to date with 'origin/cryostat-v2.3'.

You are currently cherry-picking commit 64e99af.
  (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)

Changes to be committed:
	modified:   Makefile
	modified:   internal/images/custom-scorecard-tests/rbac/scorecard_role.yaml
	modified:   internal/test/scorecard/tests.go

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

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* test(scorecard): log workload conditions/events upon failure

Signed-off-by: Elliott Baron <ebaron@redhat.com>

* Revert timeout in tests

---------

Signed-off-by: Elliott Baron <ebaron@redhat.com>
(cherry picked from commit 64e99af)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
#	bundle/tests/scorecard/config.yaml
#	config/scorecard/patches/custom.config.yaml
@mergify mergify bot added the conflicts label Apr 26, 2023
@mergify mergify bot assigned ebaron Apr 26, 2023
@ebaron ebaron added test and removed conflicts labels Apr 26, 2023
@ebaron ebaron merged commit 571f4bd into cryostat-v2.3 Apr 26, 2023
@mergify mergify bot deleted the mergify/bp/cryostat-v2.3/pr-560 branch April 26, 2023 21:31
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.

1 participant